ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

initramfs: make dir_entry.name a flexible array member

Browse Source 
dir_entry.name is currently allocated via a separate kstrdup().  Change it
to a flexible array member and allocate it along with struct dir_entry.

Link: https://lkml.kernel.org/r/20220404093429.27570-3-ddiss@suse.de
Signed-off-by: David Disseldorp <ddiss@suse.de>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
David Disseldorp
2022-05-09 18:29:19 -07:00
committed by akpm
parent da028e4c4b
commit fcb7aedd2e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
init/initramfs.c
View File

@@ -130,17 +130,20 @@ static long __init do_utime(char *filename, time64_t mtime)
static __initdata LIST_HEAD(dir_list); static __initdata LIST_HEAD(dir_list);
struct dir_entry { struct dir_entry {
struct list_head list; struct list_head list;
char *name;
time64_t mtime; time64_t mtime;
char name[];
}; };
static void __init dir_add(const char *name, time64_t mtime) static void __init dir_add(const char *name, time64_t mtime)
{ {
struct dir_entry *de = kmalloc(sizeof(struct dir_entry), GFP_KERNEL); size_t nlen = strlen(name) + 1;
struct dir_entry *de;
de = kmalloc(sizeof(struct dir_entry) + nlen, GFP_KERNEL);
if (!de) if (!de)
panic_show_mem("can't allocate dir_entry buffer"); panic_show_mem("can't allocate dir_entry buffer");
INIT_LIST_HEAD(&de->list); INIT_LIST_HEAD(&de->list);
de->name = kstrdup(name, GFP_KERNEL); strscpy(de->name, name, nlen);
de->mtime = mtime; de->mtime = mtime;
list_add(&de->list, &dir_list); list_add(&de->list, &dir_list);
} }
@@ -151,7 +154,6 @@ static void __init dir_utime(void)
list_for_each_entry_safe(de, tmp, &dir_list, list) { list_for_each_entry_safe(de, tmp, &dir_list, list) {
list_del(&de->list); list_del(&de->list);
do_utime(de->name, de->mtime); do_utime(de->name, de->mtime);
kfree(de->name);
kfree(de); kfree(de);
} }
} }