lkml.org 
[lkml]   [2019]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] nbd: prevent memory leak
On Mon, Sep 23, 2019 at 3:10 PM Navid Emamdoost
<navid.emamdoost@gmail.com> wrote:
>
> 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.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---

Would you please review this patch?

Thanks,

> drivers/block/nbd.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index a8e3815295fe..8ae3bd2e7b30 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -987,14 +987,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);
> --
> 2.17.1
>


--
Navid.

\
 
 \ /
  Last update: 2019-11-21 19:25    [W:0.046 / U:1.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site