target/linux/generic/pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Sun, 22 Nov 2020 00:48:33 +0100
   3 Subject: [PATCH RFC] mtd: parser: cmdline: Fix parsing of part-names with colons
   4
   5 Some devices (especially QCA ones) are already using hardcoded partition
   6 names with colons in it. The OpenMesh A62 for example provides following
   7 mtd relevant information via cmdline:
   8
   9   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
  10
  11 The change to split only on the last colon between mtd-id and partitions
  12 will cause newpart to see following string for the first partition:
  13
  14   KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive)
  15
  16 Such a partition list cannot be parsed and thus the device fails to boot.
  17
  18 Avoid this behavior by making sure that the start of the first part-name
  19 ("(") will also be the last byte the mtd-id split algorithm is using for
  20 its colon search.
  21
  22 Forwarded: https://patchwork.ozlabs.org/project/linux-mtd/patch/20201122001533.985641-1-sven@narfation.org/
  23 Fixes: eb13fa022741 ("mtd: parser: cmdline: Support MTD names containing one or more colons")
  24 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  25
  26 diff --git a/drivers/mtd/parsers/cmdlinepart.c b/drivers/mtd/parsers/cmdlinepart.c
  27 index 0625b25620ca766318ea4646a6e3761ff4d3a4cc..22881ea4c132ea5a5ba7aebd025d91bf1cd023af 100644
  28 --- a/drivers/mtd/parsers/cmdlinepart.c
  29 +++ b/drivers/mtd/parsers/cmdlinepart.c
  30 @@ -218,7 +218,7 @@ static int mtdpart_setup_real(char *s)
  31                 struct cmdline_mtd_partition *this_mtd;
  32                 struct mtd_partition *parts;
  33                 int mtd_id_len, num_parts;
  34 -               char *p, *mtd_id, *semicol;
  35 +               char *p, *mtd_id, *semicol, *open_parenth;
  36
  37                 /*
  38                  * Replace the first ';' by a NULL char so strrchr can work
  39 @@ -228,6 +228,13 @@ static int mtdpart_setup_real(char *s)
  40                 if (semicol)
  41                         *semicol = '\0';
  42
  43 +               /* make sure that part-names with ":" will not be handled as
  44 +                * part of the mtd-id with an ":"
  45 +                */
  46 +               open_parenth = strchr(s, '(');
  47 +               if (open_parenth)
  48 +                       *open_parenth = '\0';
  49 +
  50                 mtd_id = s;
  51
  52                 /*
  53 @@ -237,6 +244,10 @@ static int mtdpart_setup_real(char *s)
  54                  */
  55                 p = strrchr(s, ':');
  56
  57 +               /* Restore the '(' now. */
  58 +               if (open_parenth)
  59 +                       *open_parenth = '(';
  60 +
  61                 /* Restore the ';' now. */
  62                 if (semicol)
  63                         *semicol = ';';