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

Commit 5f3a5cb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:
 "Two small (really, one liners both of them!) fixes that should go into
  this series:

   - Request allocation error handling fix for nbd, from Christophe,
     fixing a regression in this series.

   - An oops fix for drbd. Not a regression in this series, but stable
     material. From Richard"

* 'for-linus' of git://git.kernel.dk/linux-block:
  drbd: Fix kernel_sendmsg() usage - potential NULL deref
  nbd: Fix error handling
parents 8233008f d8e9e5e8

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1871,7 +1871,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock, 
		drbd_update_congested(connection);

	}

	do {

		rv = kernel_sendmsg(sock, &msg, &iov, 1, size);

		rv = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len);

		if (rv == -EAGAIN) {

			if (we_should_drop_the_connection(connection, sock))

				break;

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
			return -EINVAL;



		sreq = blk_mq_alloc_request(bdev_get_queue(bdev), WRITE, 0);

		if (!sreq)

		if (IS_ERR(sreq))

			return -ENOMEM;



		mutex_unlock(&nbd->tx_lock);