Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mtd/tests/mtd_oobtest.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/mtd/tests/mtd_pagetest.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

	}