aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Palacios <hector.palacios@digi.com>2016-07-18 04:39:18 -0400
committerBrian Norris <computersforpeace@gmail.com>2016-07-19 15:54:14 -0400
commit144f4c98399e2c0ca60eb414c15a2c68125c18b8 (patch)
tree5bb503118e4b2c3a0944455cb36f01c0fd1c47da
parent0a526341fee054c1e2b9f0e4b2b424ae81707d4c (diff)
mtd: nand: fix bug writing 1 byte less than page size
nand_do_write_ops() determines if it is writing a partial page with the formula: part_pagewr = (column || writelen < (mtd->writesize - 1)) When 'writelen' is exactly 1 byte less than the NAND page size the formula equates to zero, so the code doesn't process it as a partial write, although it should. As a consequence the function remains in the while(1) loop with 'writelen' becoming 0xffffffff and iterating endlessly. The bug may not be easy to reproduce in Linux since user space tools usually force the padding or round-up the write size to a page-size multiple. This was discovered in U-Boot where the issue can be reproduced by writing any size that is 1 byte less than a page-size multiple. For example, on a NAND with 2K page (0x800): => nand erase.part <partition> => nand write $loadaddr <partition> 7ff [Editor's note: the bug was added in commit 29072b96078f, but moved around in commit 66507c7bc8895 ("mtd: nand: Add support to use nand_base poi databuf as bounce buffer")] Fixes: 29072b96078f ("[MTD] NAND: add subpage write support") Signed-off-by: Hector Palacios <hector.palacios@digi.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: <stable@vger.kernel.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/mtd/nand/nand_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 0b0dc29d2af7..77533f7f2429 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2610,7 +2610,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
2610 int cached = writelen > bytes && page != blockmask; 2610 int cached = writelen > bytes && page != blockmask;
2611 uint8_t *wbuf = buf; 2611 uint8_t *wbuf = buf;
2612 int use_bufpoi; 2612 int use_bufpoi;
2613 int part_pagewr = (column || writelen < (mtd->writesize - 1)); 2613 int part_pagewr = (column || writelen < mtd->writesize);
2614 2614
2615 if (part_pagewr) 2615 if (part_pagewr)
2616 use_bufpoi = 1; 2616 use_bufpoi = 1;