Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190923200959.29643-1-navid.emamdoost@gmail.com>
In-Reply-To: <20190923200959.29643-1-navid.emamdoost@gmail.com>
From:   Navid Emamdoost <navid.emamdoost@gmail.com>
Date:   Thu, 21 Nov 2019 12:24:34 -0600
Message-ID: <CAEkB2ERDAtBqWP12VrPb285ypMnQ8svExg2MZ3sBP6Q8B_006g@mail.gmail.com>
Subject: Re: [PATCH] nbd: prevent memory leak
To:     Josef Bacik <josef@toxicpanda.com>, Jens Axboe <axboe@kernel.dk>,
        linux-block@vger.kernel.org, nbd@other.debian.org
Cc:     Navid Emamdoost <emamd001@umn.edu>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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.