tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 29119529 c2b58149

+2 -1
+1 -1
drivers/block/drbd/drbd_worker.c
··· 282 282 what = COMPLETED_OK; 283 283 } 284 284 285 - bio_put(req->private_bio); 286 285 req->private_bio = ERR_PTR(blk_status_to_errno(bio->bi_status)); 286 + bio_put(bio); 287 287 288 288 /* not req_mod(), we need irqsave here! */ 289 289 spin_lock_irqsave(&device->resource->req_lock, flags);
+1
drivers/block/loop.c
··· 1613 1613 arg = (unsigned long) compat_ptr(arg); 1614 1614 case LOOP_SET_FD: 1615 1615 case LOOP_CHANGE_FD: 1616 + case LOOP_SET_BLOCK_SIZE: 1616 1617 err = lo_ioctl(bdev, mode, cmd, arg); 1617 1618 break; 1618 1619 default: