nbd: prevent memory leak
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Mon, 23 Sep 2019 20:09:58 +0000 (15:09 -0500)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 Nov 2019 18:33:41 +0000 (11:33 -0700)
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>
drivers/block/nbd.c

index ac07e8c..f471142 100644 (file)
@@ -1004,14 +1004,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);