diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2020-04-29 18:53:47 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-06-05 10:16:14 +0200 |
| commit | eb13fa0227417e84aecc3bd9c029d376e33474d3 (patch) | |
| tree | 61c3a16346cf8ab89975f9175bbd99a39d576372 /drivers/mtd | |
| parent | mtd: physmap_of_gemini: remove defined but not used symbol 'syscon_match' (diff) | |
| download | linux-eb13fa0227417e84aecc3bd9c029d376e33474d3.tar.xz linux-eb13fa0227417e84aecc3bd9c029d376e33474d3.zip | |
mtd: parser: cmdline: Support MTD names containing one or more colons
Looks like some drivers define MTD names with a colon in it, thus
making mtdpart= parsing impossible. Let's fix the parser to gracefully
handle that case: the last ':' in a partition definition sequence is
considered instead of the first one.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Ron Minnich <rminnich@google.com>
Tested-by: Ron Minnich <rminnich@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/parsers/cmdlinepart.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/drivers/mtd/parsers/cmdlinepart.c b/drivers/mtd/parsers/cmdlinepart.c index af712f1519c5..a79e4d866b08 100644 --- a/drivers/mtd/parsers/cmdlinepart.c +++ b/drivers/mtd/parsers/cmdlinepart.c @@ -226,12 +226,29 @@ 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; + char *p, *mtd_id, *semicol; + + /* + * Replace the first ';' by a NULL char so strrchr can work + * properly. + */ + semicol = strchr(s, ';'); + if (semicol) + *semicol = '\0'; mtd_id = s; - /* fetch <mtd-id> */ - p = strchr(s, ':'); + /* + * fetch <mtd-id>. We use strrchr to ignore all ':' that could + * be present in the MTD name, only the last one is interpreted + * as an <mtd-id>/<part-definition> separator. + */ + p = strrchr(s, ':'); + + /* Restore the ';' now. */ + if (semicol) + *semicol = ';'; + if (!p) { pr_err("no mtd-id\n"); return -EINVAL; |