Skip to contentSkip to conversation

initramfs: Fix a missing-chek bug in dir_add()

PATCH In review Gen Zhang 2 participants 3 messages May 24, 2019 VFS

lore
Share & tools
lore

Gen Zhang

author
#0 lore raw

PATCH v2 1/1 initramfs: Fix a missing-chek bug in dir_add()

In dir_add() and do_name(), de->name and vcollected are allocated by kstrdup(). And de->name and vcollected are dereferenced in the following codes. However, memory allocation functions such as kstrdup() may fail. Dereferencing this null pointer may cause the kernel go wrong. Thus we should check these two kstrdup() operations.
Further, if kstrdup() returns NULL, we should free de in dir_add().

---

init/initramfs.c +0 -0
index 178130f..1421488 100644
@@ -125,6 +125,10 @@ static void __init dir_add(const char *name, time64_t mtime)
		panic("can't allocate dir_entry buffer");
	INIT_LIST_HEAD(&de->list);
	de->name = kstrdup(name, GFP_KERNEL);

+ if (!de->name) {
+ kfree(de);
+ panic("can't allocate dir_entry name buffer");
+ }

	de->mtime = mtime;
	list_add(&de->list, &dir_list);
 }
@@ -340,6 +344,10 @@ static int __init do_name(void)
				if (body_len)
					ksys_ftruncate(wfd, body_len);
				vcollected = kstrdup(collected, GFP_KERNEL);

+ if (!vcollected) {
+ panic("can't allocate vcollected buffer");
+ return 0;
+ }

				state = CopyFile;
			}
		}
#1 lore raw
Quoted 6 lines · On Fri, 24 May 2019 11:30:45 +0800 Gen Zhang <[email protected]> wrote:

In dir_add() and do_name(), de->name and vcollected are allocated by kstrdup(). And de->name and vcollected are dereferenced in the following codes. However, memory allocation functions such as kstrdup() may fail. Dereferencing this null pointer may cause the kernel go wrong. Thus we should check these two kstrdup() operations.
Further, if kstrdup() returns NULL, we should free de in dir_add().

We generally assume that memory allocations within __init code cannot fail. If one does fail, something quite horrid has happened. The resulting oops will provide the same information as the proposed panic() anyway.

author
#2 lore raw

Re: [PATCH v2] initramfs: Fix a missing-chek bug in dir_add()[email protected]、

Quoted 9 lines · Andrew Morton
Quoted 6 lines · On Fri, 24 May 2019 11:30:45 +0800 Gen Zhang <[email protected]> wrote:

In dir_add() and do_name(), de->name and vcollected are allocated by kstrdup(). And de->name and vcollected are dereferenced in the following codes. However, memory allocation functions such as kstrdup() may fail. Dereferencing this null pointer may cause the kernel go wrong. Thus we should check these two kstrdup() operations.
Further, if kstrdup() returns NULL, we should free de in dir_add().

Quoted 4 lines

We generally assume that memory allocations within __init code cannot fail. If one does fail, something quite horrid has happened. The resulting oops will provide the same information as the proposed panic() anyway.

Thanks for your reply, Andrew.
You mean that it is not necessary to check memory allcoation in __init, right?
Thanks
Gen