block: add bdev_read_only() checks to common helpers
authorIlya Dryomov <idryomov@gmail.com>
Thu, 11 Jan 2018 13:09:12 +0000 (14:09 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 18 Jan 2018 19:57:19 +0000 (12:57 -0700)
Similar to blkdev_write_iter(), return -EPERM if the partition is
read-only.  This covers ioctl(), fallocate() and most in-kernel users
but isn't meant to be exhaustive -- everything else will be caught in
generic_make_request_checks(), fail with -EIO and can be fixed later.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-lib.c

index 2bc544c..a676084 100644 (file)
@@ -37,6 +37,9 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
        if (!q)
                return -ENXIO;
 
+       if (bdev_read_only(bdev))
+               return -EPERM;
+
        if (flags & BLKDEV_DISCARD_SECURE) {
                if (!blk_queue_secure_erase(q))
                        return -EOPNOTSUPP;
@@ -156,6 +159,9 @@ static int __blkdev_issue_write_same(struct block_device *bdev, sector_t sector,
        if (!q)
                return -ENXIO;
 
+       if (bdev_read_only(bdev))
+               return -EPERM;
+
        bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
        if ((sector | nr_sects) & bs_mask)
                return -EINVAL;
@@ -233,6 +239,9 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev,
        if (!q)
                return -ENXIO;
 
+       if (bdev_read_only(bdev))
+               return -EPERM;
+
        /* Ensure that max_write_zeroes_sectors doesn't overflow bi_size */
        max_write_zeroes_sectors = bdev_write_zeroes_sectors(bdev);
 
@@ -287,6 +296,9 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev,
        if (!q)
                return -ENXIO;
 
+       if (bdev_read_only(bdev))
+               return -EPERM;
+
        while (nr_sects != 0) {
                bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),
                               gfp_mask);