Merge tag 'for-linus-20180706' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Two minor fixes for this series:

   - add LOOP_SET_BLOCK_SIZE as compat ioctl (Evan Green)

   - drbd use-after-free fix (Lars Ellenberg)"

* tag 'for-linus-20180706' of git://git.kernel.dk/linux-block:
  loop: Add LOOP_SET_BLOCK_SIZE in compat ioctl
  drbd: fix access after free

diff --combined drivers/block/loop.c
index d6b6f43,258355c..4cb1d1b
--- 1/drivers/block/loop.c
--- 2/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -524,8 -524,7 +524,8 @@@ static int lo_rw_aio(struct loop_devic
  
                __rq_for_each_bio(bio, rq)
                        segments += bio_segments(bio);
 -              bvec = kmalloc(sizeof(struct bio_vec) * segments, GFP_NOIO);
 +              bvec = kmalloc_array(segments, sizeof(struct bio_vec),
 +                                   GFP_NOIO);
                if (!bvec)
                        return -EIO;
                cmd->bvec = bvec;
@@@ -1613,6 -1612,7 +1613,7 @@@ static int lo_compat_ioctl(struct block
                arg = (unsigned long) compat_ptr(arg);
        case LOOP_SET_FD:
        case LOOP_CHANGE_FD:
+       case LOOP_SET_BLOCK_SIZE:
                err = lo_ioctl(bdev, mode, cmd, arg);
                break;
        default: