public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/6] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init
Date: Mon, 20 Jun 2016 09:50:37 +0200	[thread overview]
Message-ID: <20160620075037.GD1538@localhost.localdomain> (raw)
In-Reply-To: <20160620074707.GA1268@localhost.localdomain>

A private buffer is used to read mtdparts variable from non-relocated
environment. A pointer to that buffer is returned unconditionally,
confusing later test for variable presence in the environment.
Fix it by returning NULL when getenv_f fails.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
--
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 44b2c3a..3a88a10 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1720,11 +1720,13 @@ int mtdparts_init(void)
 	 * before the env is relocated, then we need to use our own stack
 	 * buffer.  gd->env_buf will be too small.
 	 */
-	if (gd->flags & GD_FLG_ENV_READY) {
+	if (gd->flags & GD_FLG_ENV_READY)
 		parts = getenv("mtdparts");
-	} else {
-		parts = tmp_parts;
-		getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN);
+	else {
+		if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
+			parts = tmp_parts;
+		else
+			parts = NULL;
 	}
 	current_partition = getenv("partition");
 
-- 
2.1.4

  parent reply	other threads:[~2016-06-20  7:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-20  7:47 [U-Boot] [PATCH 0/6] mtd fixes for u-boot-2016.07-rc1 Ladislav Michl
2016-06-20  7:48 ` [U-Boot] [PATCH 1/6] armv7: add reset timeout to identify_nand_chip Ladislav Michl
2016-06-20  7:49 ` [U-Boot] [PATCH 2/6] mtd: OneNAND: add timeout to wait ready loops Ladislav Michl
2016-06-20  7:49 ` [U-Boot] [PATCH 3/6] mtd: OneNAND: initialize mtd->writebufsize to let UBI work Ladislav Michl
2016-06-20  7:50 ` Ladislav Michl [this message]
2016-06-20  7:51 ` [U-Boot] [PATCH 5/6] cmd: mtdparts: fix null pointer dereference in parse_mtdparts Ladislav Michl
2016-06-20  7:51 ` [U-Boot] [PATCH 6/6] cmd: mtdparts: consolidate mtdparts reading from env Ladislav Michl

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=20160620075037.GD1538@localhost.localdomain \
    --to=ladis@linux-mips.org \
    --cc=u-boot@lists.denx.de \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox