public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Boris Brezillon <boris.brezillon@bootlin.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/9] mtd: Make sure the name passed in mtdparts fits in mtd_name[]
Date: Mon, 19 Nov 2018 12:51:19 +0100	[thread overview]
Message-ID: <20181119115121.7699-7-boris.brezillon@bootlin.com> (raw)
In-Reply-To: <20181119115121.7699-1-boris.brezillon@bootlin.com>

The local mtd_name[] variable is limited in size. Return an error if
the name passed in mtdparts does not fit in this local var.

Fixes: 5db66b3aee6f ("cmd: mtd: add 'mtd' command")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Changes in v2:
- New patch
---
 drivers/mtd/mtd_uboot.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index d551aee20203..0eda36278309 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -222,8 +222,8 @@ int mtd_probe_devices(void)
 	while (mtdparts[0] != '\0') {
 		char mtd_name[MTD_NAME_MAX_LEN], *colon;
 		struct mtd_partition *parts;
-		int mtd_name_len, nparts;
-		int ret;
+		unsigned int mtd_name_len;
+		int nparts, ret;
 
 		colon = strchr(mtdparts, ':');
 		if (!colon) {
@@ -231,7 +231,12 @@ int mtd_probe_devices(void)
 			return -EINVAL;
 		}
 
-		mtd_name_len = colon - mtdparts;
+		mtd_name_len = (unsigned int)(colon - mtdparts);
+		if (mtd_name_len + 1 > sizeof(mtd_name)) {
+			printf("MTD name too long: %s\n", mtdparts);
+			return -EINVAL;
+		}
+
 		strncpy(mtd_name, mtdparts, mtd_name_len);
 		mtd_name[mtd_name_len] = '\0';
 		/* Move the pointer forward (including the ':') */
-- 
2.17.1

  parent reply	other threads:[~2018-11-19 11:51 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 11:51 [U-Boot] [PATCH 1/9] mtd: Add a function to report when the MTD dev list has been updated Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 2/9] mtd: Parse mtdparts/mtdids again when the MTD " Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 3/9] mtd: Delete partitions attached to the device when a device is deleted Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 4/9] mtd: sf: Make sure we don't register the same device twice Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 5/9] mtd: Use get_mtdids() instead of env_get("mtdids") in mtd_search_alternate_name() Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 6/9] mtd: Be more strict on the "mtdparts=" prefix check Boris Brezillon
2018-11-19 11:51 ` Boris Brezillon [this message]
2018-11-19 11:51 ` [U-Boot] [PATCH 8/9] mtd: Make sure we don't parse MTD partitions belonging to another dev Boris Brezillon
2018-11-19 11:51 ` [U-Boot] [PATCH 9/9] mtd: Don't stop MTD partition creation when it fails on one device Boris Brezillon
2018-11-19 12:40 ` [U-Boot] [PATCH 1/9] mtd: Add a function to report when the MTD dev list has been updated Boris Brezillon
2018-11-19 13:30   ` Heiko Schocher
2018-11-19 13:44     ` Boris Brezillon

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=20181119115121.7699-7-boris.brezillon@bootlin.com \
    --to=boris.brezillon@bootlin.com \
    --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