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

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

Pull block fix from Jens Axboe:
 "Just a single fix for an issue in nbd introduced in this cycle"

* tag 'for-linus-20191121' of git://git.kernel.dk/linux-block:
  nbd:fix memory leak in nbd_get_socket()
parents cec353f6 dff10bbe

drivers/block/nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd, 
	if (sock->ops->shutdown == sock_no_shutdown) {

		dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n");

		*err = -EINVAL;

		sockfd_put(sock);

		return NULL;

	}