From 7b54d52a443e7f8a9a0ce23003b42dcab5f64f96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sat, 12 May 2018 23:34:43 +0200 Subject: [PATCH] kernel: use accepted version of bcm47xxpart fix commit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki (cherry picked from commit 404508001e9f2bbf09fc4c4027cf16b8720124db) --- ...-bcm47xxpart-improve-handling-TRX-partition-size.patch} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) rename target/linux/generic/patches-4.4/{141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch => 042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch} (88%) diff --git a/target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch similarity index 88% rename from target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch rename to target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch index 31acebf50f..eb3f9bdfc8 100644 --- a/target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch +++ b/target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch @@ -1,4 +1,6 @@ +From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Thu, 12 Apr 2018 07:24:52 +0200 Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -6,7 +8,7 @@ Content-Transfer-Encoding: 8bit When bcm47xxpart finds a TRX partition (container) it's supposed to jump to the end of it and keep looking for more partitions. TRX and its -subpartitions are handled be a separated parser. +subpartitions are handled by a separate parser. The problem with old code was relying on the length specified in a TRX header. That isn't reliable as TRX is commonly modified to have checksum @@ -22,7 +24,10 @@ This makes code more optimal & reliable thanks to skipping data that shouldn't be parsed. Signed-off-by: Rafał Miłecki +Signed-off-by: Boris Brezillon --- + drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -- 2.25.1