[PATCH v2] nbd: fix possible memory leak

[PATCH v2] nbd: fix possible memory leak

[Sudip Mukherjee]

we have already allocated memory for nbd_dev, but we were not
releasing that memory and just returning the error value.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

v2: moved kcalloc after the returns.

 drivers/block/nbd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4bc2a5c..db93c75 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -803,10 +803,6 @@ static int __init nbd_init(void)
 		return -EINVAL;
 	}
 
-	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
-	if (!nbd_dev)
-		return -ENOMEM;
-
 	part_shift = 0;
 	if (max_part > 0) {
 		part_shift = fls(max_part);
@@ -827,6 +823,10 @@ static int __init nbd_init(void)
 
 	if (nbds_max > 1UL << (MINORBITS - part_shift))
 		return -EINVAL;
+
+	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
+	if (!nbd_dev)
+		return -ENOMEM;
 
 	for (i = 0; i < nbds_max; i++) {
 		struct gendisk *disk = alloc_disk(1 << part_shift);
-- 
1.8.1.2

Re: [PATCH v2] nbd: fix possible memory leak

[Paul Clements]

On Tue, Jan 27, 2015 at 7:38 AM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> we have already allocated memory for nbd_dev, but we were not
> releasing that memory and just returning the error value.
>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Looks good to me.

Acked-by: Paul Clements <Paul.Clements@SteelEye.com>

> ---
>
> v2: moved kcalloc after the returns.
>
>  drivers/block/nbd.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index 4bc2a5c..db93c75 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -803,10 +803,6 @@ static int __init nbd_init(void)
>                 return -EINVAL;
>         }
>
> -       nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
> -       if (!nbd_dev)
> -               return -ENOMEM;
> -
>         part_shift = 0;
>         if (max_part > 0) {
>                 part_shift = fls(max_part);
> @@ -827,6 +823,10 @@ static int __init nbd_init(void)
>
>         if (nbds_max > 1UL << (MINORBITS - part_shift))
>                 return -EINVAL;
> +
> +       nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
> +       if (!nbd_dev)
> +               return -ENOMEM;
>
>         for (i = 0; i < nbds_max; i++) {
>                 struct gendisk *disk = alloc_disk(1 << part_shift);
> --
> 1.8.1.2
>

Re: [Nbd] [PATCH v2] nbd: fix possible memory leak

[Markus Pargmann]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On Tue, Jan 27, 2015 at 06:08:22PM +0530, Sudip Mukherjee wrote:
> we have already allocated memory for nbd_dev, but we were not
> releasing that memory and just returning the error value.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Thanks, applied.

Regards,

Markus

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]