diff options
| author | John Crispin <john@openwrt.org> | 2014-12-03 14:32:38 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-12-03 14:32:38 +0000 |
| commit | a10a204aab26ccec266cd09fa94110a61293fdd9 (patch) | |
| tree | da798ee0f320346605bbff5e41308365e9c2addd /target/linux/generic/patches-3.10 | |
| parent | 68909fb081065094138ca02d23231902accb5171 (diff) | |
| download | upstream-a10a204aab26ccec266cd09fa94110a61293fdd9.tar.gz upstream-a10a204aab26ccec266cd09fa94110a61293fdd9.tar.bz2 upstream-a10a204aab26ccec266cd09fa94110a61293fdd9.zip | |
kernel: make ubi auto-attach check for a tar file magic
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 43506
Diffstat (limited to 'target/linux/generic/patches-3.10')
| -rw-r--r-- | target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index b0b367eb77..68e98ca8c1 100644 --- a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1207,6 +1207,36 @@ static struct mtd_info * __init open_mtd +@@ -1207,6 +1207,47 @@ return mtd; } @@ -29,6 +29,17 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + mtd = open_mtd_device("data"); + + if (!IS_ERR(mtd)) { ++ size_t len; ++ char magic[6]; ++ ++ /* check for a tar file magic */ ++ err = mtd_read(mtd, 261, 6, &len, (void *) magic); ++ if (!err && len == 6 && !strncmp(magic, "ustar", 5)) { ++ ubi_err("cannot attach mtd%d as there is a valid tar magic", mtd->index); ++ put_mtd_device(mtd); ++ return; ++ } ++ + /* auto-add only media types where UBI makes sense */ + if (mtd->type == MTD_NANDFLASH || + mtd->type == MTD_DATAFLASH || @@ -48,7 +59,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static int __init ubi_init(void) { int err, i, k; -@@ -1290,6 +1320,12 @@ static int __init ubi_init(void) +@@ -1290,6 +1331,12 @@ } } |