From: Greg Kroah-Hartman Date: Mon, 24 Jan 2022 14:48:32 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.4.300~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d4f10fb90d60f43216a7c37247c47f523601441;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch --- diff --git a/queue-5.10/mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch b/queue-5.10/mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch new file mode 100644 index 00000000000..ab4bf890313 --- /dev/null +++ b/queue-5.10/mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch @@ -0,0 +1,36 @@ +From fd0d8d85f7230052e638a56d1bfea170c488e6bc Mon Sep 17 00:00:00 2001 +From: "Doyle, Patrick" +Date: Tue, 6 Apr 2021 10:47:08 +0900 +Subject: mtd: nand: bbt: Fix corner case in bad block table handling + +From: Doyle, Patrick + +commit fd0d8d85f7230052e638a56d1bfea170c488e6bc upstream. + +In the unlikely event that both blocks 10 and 11 are marked as bad (on a +32 bit machine), then the process of marking block 10 as bad stomps on +cached entry for block 11. There are (of course) other examples. + +Signed-off-by: Patrick Doyle +Reviewed-by: Richard Weinberger +Signed-off-by: Yoshio Furuyama +[: Fixed the title] +Signed-off-by: Miquel Raynal +Cc: Frieder Schrempf +Link: https://lore.kernel.org/linux-mtd/774a92693f311e7de01e5935e720a179fb1b2468.1616635406.git.ytc-mb-yfuruyama7@kioxia.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/bbt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/nand/bbt.c ++++ b/drivers/mtd/nand/bbt.c +@@ -123,7 +123,7 @@ int nanddev_bbt_set_block_status(struct + unsigned int rbits = bits_per_block + offs - BITS_PER_LONG; + + pos[1] &= ~GENMASK(rbits - 1, 0); +- pos[1] |= val >> rbits; ++ pos[1] |= val >> (bits_per_block - rbits); + } + + return 0; diff --git a/queue-5.10/series b/queue-5.10/series index c95743e1683..284cee0379b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -561,3 +561,4 @@ scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch lib82596-fix-irq-check-in-sni_82596_probe.patch mm-hmm.c-allow-vm_mixedmap-to-work-with-hmm_range_fault.patch lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch +mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch