mtd-utils: ubi-tests: fix a some overflows

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/tests/ubi-tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
index 27f4795ca292a39592374fa0933e458a3868dbea..486fbab218a3aaebeef40731143d17f1c7f4fe40 100644 (file)
--- a/tests/ubi-tests/mkvol_bad.c
+++ b/tests/ubi-tests/mkvol_bad.c
@@ -106,7 +106,7 @@ static int test_mkvol(void)
                return -1;
 
        req.alignment = dev_info.leb_size - dev_info.min_io_size;
-       req.bytes = (dev_info.leb_size - dev_info.leb_size % req.alignment) *
+       req.bytes = (long long)(dev_info.leb_size - dev_info.leb_size % req.alignment) *
                    dev_info.avail_lebs + 1;
        ret = ubi_mkvol(libubi, node, &req);
        if (check_failed(ret, ENOSPC, "ubi_mkvol", "bytes = %lld", req.bytes))

diff --git a/tests/ubi-tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
index cda72410e2a93591ff1ead3ac90184039bb4edcf..2ff6ac105f303867a8e9679d858e339938d13d1c 100644 (file)
--- a/tests/ubi-tests/mkvol_basic.c
+++ b/tests/ubi-tests/mkvol_basic.c
@@ -55,7 +55,7 @@ static int mkvol_alignment(void)
 
                /* Bear in mind alignment reduces EB size */
                ebsz = dev_info.leb_size - dev_info.leb_size % req.alignment;
-               req.bytes = dev_info.avail_lebs * ebsz;
+               req.bytes = (long long)dev_info.avail_lebs * ebsz;
 
                req.vol_type = UBI_DYNAMIC_VOLUME;
                req.name = name;

diff --git a/tests/ubi-tests/rsvol.c b/tests/ubi-tests/rsvol.c
index 60badb0bb4b29c7a52a3b20db832ff533953658a..732bcaaa9b689446f0ae55e093c9eef657a340ca 100644 (file)
--- a/tests/ubi-tests/rsvol.c
+++ b/tests/ubi-tests/rsvol.c
@@ -169,7 +169,7 @@ static int test_rsvol1(struct ubi_vol_info *vol_info)
        }
 
        if (ubi_rsvol(libubi, node, vol_info->vol_id,
-                     vol_info->leb_size * dev_info.avail_lebs)) {
+                     (long long)vol_info->leb_size * dev_info.avail_lebs)) {
                failed("ubi_rsvol");
                return -1;
        }