lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 085/144] nbd: fix possible memory leak
    Date
    3.16.7-ckt10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

    commit ff6b8090e26ef7649ef0cc6b42389141ef48b0cf upstream.

    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>
    Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    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 fb31b8ee4372..30f0ec65415f 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)

    \
     
     \ /
      Last update: 2015-04-21 17:41    [W:4.095 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site