LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Gen Zhang <blackgod016574@gmail.com>
To: akpm@linux-foundation.org, rppt@linux.ibm.com,
	david.engraf@sysgo.com, steven.price@arm.com, osandov@fb.com,
	luc.vanoostenryck@gmail.com, axboe@kernel.dk
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH v2] initramfs: Fix a missing-chek bug in dir_add()
Date: Fri, 24 May 2019 11:30:45 +0800	[thread overview]
Message-ID: <20190524033045.GA6628@zhanggen-UX430UQ> (raw)

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().

Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
---
diff --git a/init/initramfs.c b/init/initramfs.c
index 178130f..1421488 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -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;
			}
		}

             reply	other threads:[~2019-05-24  3:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-24  3:30 Gen Zhang [this message]
2019-05-24  3:35 ` Andrew Morton
2019-05-24  3:45   ` [PATCH v2] initramfs: Fix a missing-chek bug in dir_add()teven.price@arm.com、 Gen Zhang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190524033045.GA6628@zhanggen-UX430UQ \
    --to=blackgod016574@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=david.engraf@sysgo.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luc.vanoostenryck@gmail.com \
    --cc=osandov@fb.com \
    --cc=rppt@linux.ibm.com \
    --cc=steven.price@arm.com \
    --subject='Re: [PATCH v2] initramfs: Fix a missing-chek bug in dir_add()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).