mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
mtd: tests: fix read buffer overflows
Check whether index is within bounds before testing the element. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
269c0ee663
commit
c6f7e7beb9
@ -512,7 +512,7 @@ static int __init mtd_oobtest_init(void)
|
||||
goto out;
|
||||
|
||||
addr0 = 0;
|
||||
for (i = 0; bbt[i] && i < ebcnt; ++i)
|
||||
for (i = 0; i < ebcnt && bbt[i]; ++i)
|
||||
addr0 += mtd->erasesize;
|
||||
|
||||
/* Attempt to write off end of OOB */
|
||||
|
@ -116,11 +116,11 @@ static int verify_eraseblock(int ebnum)
|
||||
loff_t addr = ebnum * mtd->erasesize;
|
||||
|
||||
addr0 = 0;
|
||||
for (i = 0; bbt[i] && i < ebcnt; ++i)
|
||||
for (i = 0; i < ebcnt && bbt[i]; ++i)
|
||||
addr0 += mtd->erasesize;
|
||||
|
||||
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;
|
||||
|
||||
set_random_data(writebuf, mtd->erasesize);
|
||||
@ -219,11 +219,11 @@ static int crosstest(void)
|
||||
memset(pp1, 0, pgsize * 4);
|
||||
|
||||
addr0 = 0;
|
||||
for (i = 0; bbt[i] && i < ebcnt; ++i)
|
||||
for (i = 0; i < ebcnt && bbt[i]; ++i)
|
||||
addr0 += mtd->erasesize;
|
||||
|
||||
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;
|
||||
|
||||
/* Read 2nd-to-last page to pp1 */
|
||||
@ -317,7 +317,7 @@ static int erasecrosstest(void)
|
||||
|
||||
ebnum = 0;
|
||||
addr0 = 0;
|
||||
for (i = 0; bbt[i] && i < ebcnt; ++i) {
|
||||
for (i = 0; i < ebcnt && bbt[i]; ++i) {
|
||||
addr0 += mtd->erasesize;
|
||||
ebnum += 1;
|
||||
}
|
||||
@ -413,7 +413,7 @@ static int erasetest(void)
|
||||
|
||||
ebnum = 0;
|
||||
addr0 = 0;
|
||||
for (i = 0; bbt[i] && i < ebcnt; ++i) {
|
||||
for (i = 0; i < ebcnt && bbt[i]; ++i) {
|
||||
addr0 += mtd->erasesize;
|
||||
ebnum += 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user