X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=inline;f=miscutils%2Fnandwrite.c;h=f42242687c1b1e4d1ba7151494991d4075d93924;hb=ea694163af05fd9cf71af52d5d8d64af81577b14;hp=8df0fdc81b15ea662e5c06a8b058979858970abe;hpb=b32a5436633f53f0abf0fa29105cf7e5b65091cf;p=oweals%2Fbusybox.git

diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 8df0fdc81..f42242687 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -52,7 +52,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
 	unsigned opts;
 	int fd;
 	ssize_t cnt;
-	unsigned mtdoffset, meminfo_writesize;
+	unsigned mtdoffset, meminfo_writesize, blockstart;
 	struct mtd_info_user meminfo;
 	unsigned char *filebuf;
 	const char *opt_s = "0";
@@ -83,9 +83,21 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
 
 	filebuf = xmalloc(meminfo_writesize);
 
+	blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+	if (blockstart != mtdoffset) {
+		unsigned tmp;
+		/* mtdoffset is in the middle of an erase block, verify that
+		 * this block is OK. Advance mtdoffset only if this block is
+		 * bad.
+		 */
+		tmp = next_good_eraseblock(fd, &meminfo, blockstart);
+		if (tmp != blockstart) /* bad block(s), advance mtdoffset */
+			mtdoffset = tmp;
+	}
+
 	cnt = -1;
 	while (mtdoffset < meminfo.size) {
-		unsigned blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+		blockstart = mtdoffset & ~(meminfo.erasesize - 1);
 		if (blockstart == mtdoffset) {
 			/* starting a new eraseblock */
 			mtdoffset = next_good_eraseblock(fd, &meminfo, blockstart);