]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nbd: don't allow invalid blocksize settings
authorJens Axboe <axboe@kernel.dk>
Tue, 4 Sep 2018 17:52:34 +0000 (11:52 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 4 Sep 2018 17:54:58 +0000 (11:54 -0600)
syzbot reports a divide-by-zero off the NBD_SET_BLKSIZE ioctl.
We need proper validation of the input here. Not just if it's
zero, but also if the value is a power-of-2 and in a valid
range. Add that.

Cc: stable@vger.kernel.org
Reported-by: syzbot <syzbot+25dbecbec1e62c6b0dd4@syzkaller.appspotmail.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/nbd.c

index 3863c00372bb9ed9b68fa41f3e692736d779b81c..14a51254c3db7f19c94cdab62e1d9e192c7ae02f 100644 (file)
@@ -1239,6 +1239,9 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
        case NBD_SET_SOCK:
                return nbd_add_socket(nbd, arg, false);
        case NBD_SET_BLKSIZE:
+               if (!arg || !is_power_of_2(arg) || arg < 512 ||
+                   arg > PAGE_SIZE)
+                       return -EINVAL;
                nbd_size_set(nbd, arg,
                             div_s64(config->bytesize, arg));
                return 0;