mtd: tests: fix more potential integer overflows

Caught by Coverity (CID #200625 and others)

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/mtd/tests/oobtest.c b/drivers/mtd/tests/oobtest.c
index 5e061186eab1..64390ab88a80 100644
--- a/drivers/mtd/tests/oobtest.c
+++ b/drivers/mtd/tests/oobtest.c
@@ -70,7 +70,7 @@ static int write_eraseblock(int ebnum)
         int i;
         struct mtd_oob_ops ops;
         int err = 0;
-        loff_t addr = ebnum * mtd->erasesize;
+        loff_t addr = (loff_t)ebnum * mtd->erasesize;
 
         prandom_bytes_state(&rnd_state, writebuf, use_len_max * pgcnt);
         for (i = 0; i < pgcnt; ++i, addr += mtd->writesize) {
diff --git a/drivers/mtd/tests/speedtest.c b/drivers/mtd/tests/speedtest.c
index 5ee9f7021020..a77019cb5510 100644
--- a/drivers/mtd/tests/speedtest.c
+++ b/drivers/mtd/tests/speedtest.c
@@ -185,7 +185,7 @@ static long calc_speed(void)
              (finish.tv_usec - start.tv_usec) / 1000;
         if (ms == 0)
                 return 0;
-        k = goodebcnt * (mtd->erasesize / 1024) * 1000;
+        k = (uint64_t)goodebcnt * (mtd->erasesize / 1024) * 1000;
         do_div(k, ms);
         return k;
 }
diff --git a/drivers/mtd/tests/stresstest.c b/drivers/mtd/tests/stresstest.c
index c9d42cc2df1b..d90c1c01dac6 100644
--- a/drivers/mtd/tests/stresstest.c
+++ b/drivers/mtd/tests/stresstest.c
@@ -96,7 +96,7 @@ static int do_read(void)
                 if (offs + len > mtd->erasesize)
                         len = mtd->erasesize - offs;
         }
-        addr = eb * mtd->erasesize + offs;
+        addr = (loff_t)eb * mtd->erasesize + offs;
         return mtdtest_read(mtd, addr, len, readbuf);
 }
 
@@ -124,7 +124,7 @@ static int do_write(void)
                         offsets[eb + 1] = 0;
                 }
         }
-        addr = eb * mtd->erasesize + offs;
+        addr = (loff_t)eb * mtd->erasesize + offs;
         err = mtdtest_write(mtd, addr, len, writebuf);
         if (unlikely(err))
                 return err;
diff --git a/drivers/mtd/tests/subpagetest.c b/drivers/mtd/tests/subpagetest.c
index 7b59ef522d5e..0b835c631f91 100644
--- a/drivers/mtd/tests/subpagetest.c
+++ b/drivers/mtd/tests/subpagetest.c
@@ -95,7 +95,7 @@ static int write_eraseblock2(int ebnum)
         loff_t addr = (loff_t)ebnum * mtd->erasesize;
 
         for (k = 1; k < 33; ++k) {
-                if (addr + (subpgsize * k) > (ebnum + 1) * mtd->erasesize)
+                if (addr + (subpgsize * k) > (loff_t)(ebnum + 1) * mtd->erasesize)
                         break;
                 prandom_bytes_state(&rnd_state, writebuf, subpgsize * k);
                 err = mtd_write(mtd, addr, subpgsize * k, &written, writebuf);
@@ -195,7 +195,7 @@ static int verify_eraseblock2(int ebnum)
         loff_t addr = (loff_t)ebnum * mtd->erasesize;
 
         for (k = 1; k < 33; ++k) {
-                if (addr + (subpgsize * k) > (ebnum + 1) * mtd->erasesize)
+                if (addr + (subpgsize * k) > (loff_t)(ebnum + 1) * mtd->erasesize)
                         break;
                 prandom_bytes_state(&rnd_state, writebuf, subpgsize * k);
                 clear_data(readbuf, subpgsize * k);
diff --git a/drivers/mtd/tests/torturetest.c b/drivers/mtd/tests/torturetest.c
index b55bc52a1340..5045cf1b3160 100644
--- a/drivers/mtd/tests/torturetest.c
+++ b/drivers/mtd/tests/torturetest.c
@@ -101,11 +101,11 @@ static inline int check_eraseblock(int ebnum, unsigned char *buf)
 {
         int err, retries = 0;
         size_t read;
-        loff_t addr = ebnum * mtd->erasesize;
+        loff_t addr = (loff_t)ebnum * mtd->erasesize;
         size_t len = mtd->erasesize;
 
         if (pgcnt) {
-                addr = (ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
+                addr = (loff_t)(ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
                 len = pgcnt * pgsize;
         }
 
@@ -155,11 +155,11 @@ static inline int write_pattern(int ebnum, void *buf)
 {
         int err;
         size_t written;
-        loff_t addr = ebnum * mtd->erasesize;
+        loff_t addr = (loff_t)ebnum * mtd->erasesize;
         size_t len = mtd->erasesize;
 
         if (pgcnt) {
-                addr = (ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
+                addr = (loff_t)(ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
                 len = pgcnt * pgsize;
         }
         err = mtd_write(mtd, addr, len, &written, buf);