From: John Crispin Date: Wed, 3 Dec 2014 14:32:38 +0000 (+0000) Subject: kernel: make ubi auto-attach check for a tar file magic X-Git-Tag: reboot~5124 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a10a204aab26ccec266cd09fa94110a61293fdd9;p=openwrt%2Fstaging%2Fpepe2k.git kernel: make ubi auto-attach check for a tar file magic Signed-off-by: John Crispin SVN-Revision: 43506 --- 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 --- 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 + 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 static int __init ubi_init(void) { int err, i, k; -@@ -1290,6 +1320,12 @@ static int __init ubi_init(void) +@@ -1290,6 +1331,12 @@ } } diff --git a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index ed83666661..ca785bfcbc 100644 --- a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd +@@ -1209,6 +1209,48 @@ return mtd; } @@ -23,12 +23,24 @@ Signed-off-by: Daniel Golle +{ + int err; + struct mtd_info *mtd; ++ + /* try attaching mtd device named "ubi" or "data" */ + mtd = open_mtd_device("ubi"); + if (IS_ERR(mtd)) + 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 +60,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1298,6 +1328,12 @@ static int __init ubi_init(void) +@@ -1298,6 +1340,12 @@ } } diff --git a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index ed83666661..2b72665853 100644 --- a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd +@@ -1209,6 +1209,47 @@ return mtd; } @@ -29,6 +29,17 @@ Signed-off-by: Daniel Golle + 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 static int __init ubi_init(void) { int err, i, k; -@@ -1298,6 +1328,12 @@ static int __init ubi_init(void) +@@ -1298,6 +1339,12 @@ } }