block, bfq: return nbytes and not zero from struct cftype .write() method

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

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 3bd15d8095b101233455d7985b834f828d89be92..77fce6f09f781fee9d92242dd2cbdfed74dec9e6 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -116,7 +116,7 @@ int blkdev_report_zones(struct block_device *bdev,
        if (!bio)
                return -ENOMEM;
 
-       bio->bi_bdev = bdev;
+       bio_set_dev(bio, bdev);
        bio->bi_iter.bi_sector = blk_zone_start(q, sector);
        bio_set_op_attrs(bio, REQ_OP_ZONE_REPORT, 0);
 
@@ -234,7 +234,7 @@ int blkdev_reset_zones(struct block_device *bdev,
 
                bio = bio_alloc(gfp_mask, 0);
                bio->bi_iter.bi_sector = sector;
-               bio->bi_bdev = bdev;
+               bio_set_dev(bio, bdev);
                bio_set_op_attrs(bio, REQ_OP_ZONE_RESET, 0);
 
                ret = submit_bio_wait(bio);
@@ -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;
 }