initramfs-make-dir_entryname-a-flexible-array-member.patch removed from -mm tree
The quilt patch titled
Subject: initramfs: make dir_entry.name a flexible array member
has been removed from the -mm tree. Its filename was
initramfs-make-dir_entryname-a-flexible-array-member.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Disseldorp <[email protected]>
Subject: initramfs: make dir_entry.name a flexible array member
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.
Signed-off-by David Disseldorp <[email protected]>
Cc Al Viro <[email protected]>
Cc Martin Wilck <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
init/initramfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
init/initramfs.c renamed from init/initramfs.c~initramfs-make-dir_entryname-a-flexible-array-member +6 -4
@@ -130,17 +130,20 @@ static long __init do_utime(char *filenastatic __initdata LIST_HEAD (dir_list);struct dir_entry {struct list_head list; -char *name;time64_t mtime; +char name[]; };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)panic_show_mem ("can't allocate dir_entry buffer" );INIT_LIST_HEAD (&de->list); - de->name =kstrdup (name,GFP_KERNEL ); +strscpy (de->name, name, nlen); de->mtime = mtime;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_del (&de->list);do_utime (de->name, de->mtime); -kfree (de->name);kfree (de); } }
_
Patches currently in -mm which might be from [email protected] are