KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: make the ubi attach patch check for a valid ubi magic rather than a tar magic

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43507
This commit is contained in:
John Crispin 2014-12-03 16:05:06 +00:00
parent a10a204aab
commit a21c9fd655
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
View file

@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c --- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c
@@ -1207,6 +1207,47 @@ @@ -1209,6 +1209,48 @@
return mtd; return mtd;
} }
@ -23,6 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+{ +{
+ int err; + int err;
+ struct mtd_info *mtd; + struct mtd_info *mtd;
+
+ /* try attaching mtd device named "ubi" or "data" */ + /* try attaching mtd device named "ubi" or "data" */
+ mtd = open_mtd_device("ubi"); + mtd = open_mtd_device("ubi");
+ if (IS_ERR(mtd)) + if (IS_ERR(mtd))
@ -30,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ +
+ if (!IS_ERR(mtd)) { + if (!IS_ERR(mtd)) {
+ size_t len; + size_t len;
+ char magic[6]; + char magic[4];
+ +
+ /* check for a tar file magic */ + /* check for a valid ubi magic */
+ err = mtd_read(mtd, 261, 6, &len, (void *) magic); + err = mtd_read(mtd, 0, 4, &len, (void *) magic);
+ if (!err && len == 6 && !strncmp(magic, "ustar", 5)) { + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
+ ubi_err("cannot attach mtd%d as there is a valid tar magic", mtd->index); + ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ return; + return;
+ } + }
@ -59,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void) static int __init ubi_init(void)
{ {
int err, i, k; int err, i, k;
@@ -1290,6 +1331,12 @@ @@ -1298,6 +1340,12 @@
} }
} }

10
target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
View file

@ -31,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ +
+ if (!IS_ERR(mtd)) { + if (!IS_ERR(mtd)) {
+ size_t len; + size_t len;
+ char magic[6]; + char magic[4];
+ +
+ /* check for a tar file magic */ + /* check for a valid ubi magic */
+ err = mtd_read(mtd, 261, 6, &len, (void *) magic); + err = mtd_read(mtd, 0, 4, &len, (void *) magic);
+ if (!err && len == 6 && !strncmp(magic, "ustar", 5)) { + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
+ ubi_err("cannot attach mtd%d as there is a valid tar magic", mtd->index); + ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ return; + return;
+ } + }

15
target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
View file

@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c --- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c
@@ -1209,6 +1209,47 @@ @@ -1209,6 +1209,48 @@
return mtd; return mtd;
} }
@ -23,6 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+{ +{
+ int err; + int err;
+ struct mtd_info *mtd; + struct mtd_info *mtd;
+
+ /* try attaching mtd device named "ubi" or "data" */ + /* try attaching mtd device named "ubi" or "data" */
+ mtd = open_mtd_device("ubi"); + mtd = open_mtd_device("ubi");
+ if (IS_ERR(mtd)) + if (IS_ERR(mtd))
@ -30,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ +
+ if (!IS_ERR(mtd)) { + if (!IS_ERR(mtd)) {
+ size_t len; + size_t len;
+ char magic[6]; + char magic[4];
+ +
+ /* check for a tar file magic */ + /* check for a valid ubi magic */
+ err = mtd_read(mtd, 261, 6, &len, (void *) magic); + err = mtd_read(mtd, 0, 4, &len, (void *) magic);
+ if (!err && len == 6 && !strncmp(magic, "ustar", 5)) { + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
+ ubi_err("cannot attach mtd%d as there is a valid tar magic", mtd->index); + ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ return; + return;
+ } + }
@ -59,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void) static int __init ubi_init(void)
{ {
int err, i, k; int err, i, k;
@@ -1298,6 +1339,12 @@ @@ -1298,6 +1340,12 @@
} }
} }