Skip to content

Commit 43094e1

Browse files
ddissbrauner
authored andcommitted
initramfs: reuse name_len for dir mtime tracking
We already have a nulterm-inclusive, checked name_len for the directory name, so use that instead of calling strlen(). Signed-off-by: David Disseldorp <ddiss@suse.de> Link: https://lore.kernel.org/r/20250304061020.9815-7-ddiss@suse.de Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 7be37c9 commit 43094e1

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

init/initramfs.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@ struct dir_entry {
144144
char name[];
145145
};
146146

147-
static void __init dir_add(const char *name, time64_t mtime)
147+
static void __init dir_add(const char *name, size_t nlen, time64_t mtime)
148148
{
149-
size_t nlen = strlen(name) + 1;
150149
struct dir_entry *de;
151150

152151
de = kmalloc(sizeof(struct dir_entry) + nlen, GFP_KERNEL);
@@ -170,7 +169,7 @@ static void __init dir_utime(void)
170169
#else
171170
static void __init do_utime(char *filename, time64_t mtime) {}
172171
static void __init do_utime_path(const struct path *path, time64_t mtime) {}
173-
static void __init dir_add(const char *name, time64_t mtime) {}
172+
static void __init dir_add(const char *name, size_t nlen, time64_t mtime) {}
174173
static void __init dir_utime(void) {}
175174
#endif
176175

@@ -394,7 +393,7 @@ static int __init do_name(void)
394393
init_mkdir(collected, mode);
395394
init_chown(collected, uid, gid, 0);
396395
init_chmod(collected, mode);
397-
dir_add(collected, mtime);
396+
dir_add(collected, name_len, mtime);
398397
} else if (S_ISBLK(mode) || S_ISCHR(mode) ||
399398
S_ISFIFO(mode) || S_ISSOCK(mode)) {
400399
if (maybe_link() == 0) {

0 commit comments

Comments
 (0)