From a21c9fd655ee6e5cc6efec2dca9b734f0be8c587 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 3 Dec 2014 16:05:06 +0000 Subject: kernel: make the ubi attach patch check for a valid ubi magic rather than a tar magic Signed-off-by: John Crispin SVN-Revision: 43507 --- ...-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/patches-3.14') 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 ca785bfcbc..f97a442cb1 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 @@ -31,12 +31,12 @@ Signed-off-by: Daniel Golle + + 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; + } -- cgit v1.2.3