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

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 43507

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 68e98ca8c1b98aafac2de43cd5b7c0aedd74f892..f97a442cb13f880365243e89948143e343024c90 100644 (file)
--- 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,47 @@
+@@ -1209,6 +1209,48 @@
        return mtd;
  }
  
@@ -23,6 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +{
 +      int err;
 +      struct mtd_info *mtd;
++
 +      /* try attaching mtd device named "ubi" or "data" */
 +      mtd = open_mtd_device("ubi");
 +      if (IS_ERR(mtd))
@@ -30,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +      if (!IS_ERR(mtd)) {
 +              size_t len;
-+              char magic[6];
++              char magic[4];
 +
-+              /* 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);
++              /* check for a valid ubi magic */
++              err = mtd_read(mtd, 0, 4, &len, (void *) magic);
++              if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
++                      ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
 +                      put_mtd_device(mtd);
 +                      return;
 +              }
@@ -59,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int __init ubi_init(void)
  {
        int err, i, k;
-@@ -1290,6 +1331,12 @@
+@@ -1298,6 +1340,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 ca785bfcbcb21e230afc642ca49df91df18c16c9..f97a442cb13f880365243e89948143e343024c90 100644 (file)
--- 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
@@ -31,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +      if (!IS_ERR(mtd)) {
 +              size_t len;
-+              char magic[6];
++              char magic[4];
 +
-+              /* 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);
++              /* check for a valid ubi magic */
++              err = mtd_read(mtd, 0, 4, &len, (void *) magic);
++              if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
++                      ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
 +                      put_mtd_device(mtd);
 +                      return;
 +              }

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