summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2014-06-24 10:12:58 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-06-25 14:37:37 (GMT)
commitcbf3bfa57a419202c2bc26f3ff8ae21d3d3bf8b2 (patch)
treea068db7e2be4e0edeaecead5ca210be0c48001d7
parentde3cae1348f212effd3f2838301596d15c6b3e54 (diff)
downloadbusybox-cbf3bfa57a419202c2bc26f3ff8ae21d3d3bf8b2.tar.gz
busybox-cbf3bfa57a419202c2bc26f3ff8ae21d3d3bf8b2.tar.bz2
nanddump: correct rounding to next page (lead to infinite loop)
The rounding to next page formula was wrong: ex: (len | ~(meminfo->writesize - 1)) + 1; len=128K writesize=4K (len | ~(meminfo->writesize - 1)) + 1 => 4 294 963 201 ?! correct rounding formula: ((len - 1) | (meminfo->writesize - 1)) + 1 => 128K len = 130K ((len - 1) | (meminfo->writesize - 1)) + 1 => 132K modprobe nandsim parts="20,20" badblocks="22,23" without patch: nanddump /dev/mtd1 | wc -c [...] infinite loop with the patch: nanddump /dev/mtd1 | wc -c 327680 Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/nandwrite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index e3f9b56..8c4da80 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -64,8 +64,8 @@ static void dump_bad(struct mtd_info_user *meminfo, unsigned len, int oob)
unsigned char buf[meminfo->writesize];
unsigned count;
- /* round len to the next page */
- len = (len | ~(meminfo->writesize - 1)) + 1;
+ /* round len to the next page only if len is not already on a page */
+ len = ((len - 1) | (meminfo->writesize - 1)) + 1;
memset(buf, 0xff, sizeof(buf));
for (count = 0; count < len; count += meminfo->writesize) {