Commit c6f7e7be authored by Roel Kluin's avatar Roel Kluin Committed by David Woodhouse

mtd: tests: fix read buffer overflows

Check whether index is within bounds before testing the element.
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 269c0ee6
...@@ -512,7 +512,7 @@ static int __init mtd_oobtest_init(void) ...@@ -512,7 +512,7 @@ static int __init mtd_oobtest_init(void)
goto out; goto out;
addr0 = 0; addr0 = 0;
for (i = 0; bbt[i] && i < ebcnt; ++i) for (i = 0; i < ebcnt && bbt[i]; ++i)
addr0 += mtd->erasesize; addr0 += mtd->erasesize;
/* Attempt to write off end of OOB */ /* Attempt to write off end of OOB */
......
...@@ -116,11 +116,11 @@ static int verify_eraseblock(int ebnum) ...@@ -116,11 +116,11 @@ static int verify_eraseblock(int ebnum)
loff_t addr = ebnum * mtd->erasesize; loff_t addr = ebnum * mtd->erasesize;
addr0 = 0; addr0 = 0;
for (i = 0; bbt[i] && i < ebcnt; ++i) for (i = 0; i < ebcnt && bbt[i]; ++i)
addr0 += mtd->erasesize; addr0 += mtd->erasesize;
addrn = mtd->size; addrn = mtd->size;
for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i) for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
addrn -= mtd->erasesize; addrn -= mtd->erasesize;
set_random_data(writebuf, mtd->erasesize); set_random_data(writebuf, mtd->erasesize);
...@@ -219,11 +219,11 @@ static int crosstest(void) ...@@ -219,11 +219,11 @@ static int crosstest(void)
memset(pp1, 0, pgsize * 4); memset(pp1, 0, pgsize * 4);
addr0 = 0; addr0 = 0;
for (i = 0; bbt[i] && i < ebcnt; ++i) for (i = 0; i < ebcnt && bbt[i]; ++i)
addr0 += mtd->erasesize; addr0 += mtd->erasesize;
addrn = mtd->size; addrn = mtd->size;
for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i) for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
addrn -= mtd->erasesize; addrn -= mtd->erasesize;
/* Read 2nd-to-last page to pp1 */ /* Read 2nd-to-last page to pp1 */
...@@ -317,7 +317,7 @@ static int erasecrosstest(void) ...@@ -317,7 +317,7 @@ static int erasecrosstest(void)
ebnum = 0; ebnum = 0;
addr0 = 0; addr0 = 0;
for (i = 0; bbt[i] && i < ebcnt; ++i) { for (i = 0; i < ebcnt && bbt[i]; ++i) {
addr0 += mtd->erasesize; addr0 += mtd->erasesize;
ebnum += 1; ebnum += 1;
} }
...@@ -413,7 +413,7 @@ static int erasetest(void) ...@@ -413,7 +413,7 @@ static int erasetest(void)
ebnum = 0; ebnum = 0;
addr0 = 0; addr0 = 0;
for (i = 0; bbt[i] && i < ebcnt; ++i) { for (i = 0; i < ebcnt && bbt[i]; ++i) {
addr0 += mtd->erasesize; addr0 += mtd->erasesize;
ebnum += 1; ebnum += 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment