UBUNTU: Ubuntu-4.15.0-96.97

[mirror_ubuntu-bionic-kernel.git] / block / blk-zoned.c

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index ff57fb51b3380bb14d7c6e449f4dada1cf6ab904..77fce6f09f781fee9d92242dd2cbdfed74dec9e6 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -286,7 +286,11 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,
        if (!rep.nr_zones)
                return -EINVAL;
 
-       zones = kcalloc(rep.nr_zones, sizeof(struct blk_zone), GFP_KERNEL);
+       if (rep.nr_zones > INT_MAX / sizeof(struct blk_zone))
+               return -ERANGE;
+
+       zones = kvmalloc(rep.nr_zones * sizeof(struct blk_zone),
+                       GFP_KERNEL | __GFP_ZERO);
        if (!zones)
                return -ENOMEM;
 
@@ -308,7 +312,7 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,
        }
 
  out:
-       kfree(zones);
+       kvfree(zones);
 
        return ret;
 }