Commit 344966da authored Sep 23, 2019 by Navid Emamdoost Committed by Greg Kroah-Hartman Dec 01, 2019

nbd: prevent memory leak



commit 03bf73c315edca28f47451913177e14cd040a216 upstream.

In nbd_add_socket when krealloc succeeds, if nsock's allocation fail the
reallocted memory is leak. The correct behaviour should be assigning the
reallocted memory to config->socks right after success.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ed7a3dde

drivers/block/nbd.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -984,14 +984,15 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,
		sockfd_put(sock);
		return -ENOMEM;
		}

		config->socks = socks;

		nsock = kzalloc(sizeof(struct nbd_sock), GFP_KERNEL);
		if (!nsock) {
		sockfd_put(sock);
		return -ENOMEM;
		}

		config->socks = socks;

		nsock->fallback_index = -1;
		nsock->dead = false;
		mutex_init(&nsock->tx_lock);