diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-01-27 18:08:22 +0530 |
|---|---|---|
| committer | Markus Pargmann <mpa@pengutronix.de> | 2015-03-05 08:51:03 +0100 |
| commit | ff6b8090e26ef7649ef0cc6b42389141ef48b0cf (patch) | |
| tree | d95d23a2b1877e052c781eaefa9658c0b4e10774 | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-ff6b8090e26ef7649ef0cc6b42389141ef48b0cf.tar.bz2 | |
nbd: fix possible memory leak
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>
Acked-by: Paul Clements <Paul.Clements@SteelEye.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
| -rw-r--r-- | drivers/block/nbd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 4bc2a5cb9935..a98c41f72c63 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); @@ -828,6 +824,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); if (!disk) |