diff options
| author | Linus Torvalds | 2018-07-07 04:13:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-07-07 04:13:42 +0200 |
| commit | 29119529d8de5179db44fe59f0155b6534ade914 (patch) | |
| tree | 423f87e1f6ac00182fa83c2fd9291b4f09b9fb2a /drivers/block/loop.c | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | loop: Add LOOP_SET_BLOCK_SIZE in compat ioctl (diff) | |
| download | kernel-qcow2-linux-29119529d8de5179db44fe59f0155b6534ade914.tar.gz kernel-qcow2-linux-29119529d8de5179db44fe59f0155b6534ade914.tar.xz kernel-qcow2-linux-29119529d8de5179db44fe59f0155b6534ade914.zip | |
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
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index d6b6f434fd4b..4cb1d1be3cfb 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1613,6 +1613,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode, 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: |