Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29119529 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c2b58149 9fea4b39

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ void drbd_request_endio(struct bio *bio) 
		what = COMPLETED_OK;

	}



	bio_put(req->private_bio);

	req->private_bio = ERR_PTR(blk_status_to_errno(bio->bi_status));

	bio_put(bio);



	/* not req_mod(), we need irqsave here! */

	spin_lock_irqsave(&device->resource->req_lock, flags);

drivers/block/loop.c

+1 −0
Original line number Diff line number Diff line
@@ -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: