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

torvalds · torvalds · commit be5fa3aac23f · 2019-11-21T12:04:50.000-08:00
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()
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,7 @@ static struct socket nbd_get_socket(struct nbd_device nbd, unsigned long fd,`
`993`	`993`	`if (sock->ops->shutdown == sock_no_shutdown) {`
`994`	`994`	`dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n");`
`995`	`995`	`*err = -EINVAL;`
	`996`	`+ sockfd_put(sock);`
`996`	`997`	`return NULL;`
`997`	`998`	`}`
`998`	`999`