* [PATCH v2] mtd: parser: cmdline: Fix parsing of part-names with colons
@ 2020-11-24 6:25 Sven Eckelmann
2020-12-07 11:16 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: Sven Eckelmann @ 2020-11-24 6:25 UTC (permalink / raw)
To: linux-mtd
Cc: rminnich, boris.brezillon, vigneshr, richard, miquel.raynal,
Sven Eckelmann, stable
Some devices (especially QCA ones) are already using hardcoded partition
names with colons in it. The OpenMesh A62 for example provides following
mtd relevant information via cmdline:
root=31:11 mtdparts=spi0.0:256k(0:SBL1),128k(0:MIBIB),384k(0:QSEE),64k(0:CDT),64k(0:DDRPARAMS),64k(0:APPSBLENV),512k(0:APPSBL),64k(0:ART),64k(custom),64k(0:KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive) rootfsname=rootfs rootwait
The change to split only on the last colon between mtd-id and partitions
will cause newpart to see following string for the first partition:
KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive)
Such a partition list cannot be parsed and thus the device fails to boot.
Avoid this behavior by making sure that the start of the first part-name
("(") will also be the last byte the mtd-id split algorithm is using for
its colon search.
Fixes: eb13fa022741 ("mtd: parser: cmdline: Support MTD names containing one or more colons")
Cc: stable@vger.kernel.org
Cc: Ron Minnich <rminnich@google.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2:
* switch from net's multi-line comment style to mtd's multiline comment style
* Add Ron Minnich as explicit Cc as we are missing his Tested-by
drivers/mtd/parsers/cmdlinepart.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/parsers/cmdlinepart.c b/drivers/mtd/parsers/cmdlinepart.c
index a79e4d866b08..0ddff1a4b51f 100644
--- a/drivers/mtd/parsers/cmdlinepart.c
+++ b/drivers/mtd/parsers/cmdlinepart.c
@@ -226,7 +226,7 @@ static int mtdpart_setup_real(char *s)
struct cmdline_mtd_partition *this_mtd;
struct mtd_partition *parts;
int mtd_id_len, num_parts;
- char *p, *mtd_id, *semicol;
+ char *p, *mtd_id, *semicol, *open_parenth;
/*
* Replace the first ';' by a NULL char so strrchr can work
@@ -236,6 +236,14 @@ static int mtdpart_setup_real(char *s)
if (semicol)
*semicol = '\0';
+ /*
+ * make sure that part-names with ":" will not be handled as
+ * part of the mtd-id with an ":"
+ */
+ open_parenth = strchr(s, '(');
+ if (open_parenth)
+ *open_parenth = '\0';
+
mtd_id = s;
/*
@@ -245,6 +253,10 @@ static int mtdpart_setup_real(char *s)
*/
p = strrchr(s, ':');
+ /* Restore the '(' now. */
+ if (open_parenth)
+ *open_parenth = '(';
+
/* Restore the ';' now. */
if (semicol)
*semicol = ';';
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mtd: parser: cmdline: Fix parsing of part-names with colons
2020-11-24 6:25 [PATCH v2] mtd: parser: cmdline: Fix parsing of part-names with colons Sven Eckelmann
@ 2020-12-07 11:16 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2020-12-07 11:16 UTC (permalink / raw)
To: Sven Eckelmann, linux-mtd
Cc: Miquel Raynal, vigneshr, richard, rminnich, stable, boris.brezillon
On Tue, 2020-11-24 at 06:25:06 UTC, Sven Eckelmann wrote:
> Some devices (especially QCA ones) are already using hardcoded partition
> names with colons in it. The OpenMesh A62 for example provides following
> mtd relevant information via cmdline:
>
> root=31:11 mtdparts=spi0.0:256k(0:SBL1),128k(0:MIBIB),384k(0:QSEE),64k(0:CDT),64k(0:DDRPARAMS),64k(0:APPSBLENV),512k(0:APPSBL),64k(0:ART),64k(custom),64k(0:KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive) rootfsname=rootfs rootwait
>
> The change to split only on the last colon between mtd-id and partitions
> will cause newpart to see following string for the first partition:
>
> KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive)
>
> Such a partition list cannot be parsed and thus the device fails to boot.
>
> Avoid this behavior by making sure that the start of the first part-name
> ("(") will also be the last byte the mtd-id split algorithm is using for
> its colon search.
>
> Fixes: eb13fa022741 ("mtd: parser: cmdline: Support MTD names containing one or more colons")
> Cc: stable@vger.kernel.org
> Cc: Ron Minnich <rminnich@google.com>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 11:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 6:25 [PATCH v2] mtd: parser: cmdline: Fix parsing of part-names with colons Sven Eckelmann
2020-12-07 11:16 ` Miquel Raynal
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).