2019-11-19 03:14:39

by Sun Ke

[permalink] [raw]
Subject: [PATCH] nbd:fix memory leak in nbd_get_socket()

Before return NULL,put the sock first.

Fixes: cf1b2326b734 ("nbd: verify socket is supported during setup")
Signed-off-by: Sun Ke <[email protected]>
---
drivers/block/nbd.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a94ee45..19e7599 100644
--- 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;
}

--
2.7.4


2019-11-19 03:21:22

by Eric Biggers

[permalink] [raw]
Subject: Re: [PATCH] nbd:fix memory leak in nbd_get_socket()

On Tue, Nov 19, 2019 at 11:16:48AM +0800, Sun Ke wrote:
> Before return NULL,put the sock first.
>
> Fixes: cf1b2326b734 ("nbd: verify socket is supported during setup")

Since this commit went to stable kernels, can you add Cc stable to this one?

Thanks,

- Eric