lkml.org 
[lkml]   [2018]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 44/56] rfkill: gpio: fix memory leak in probe error path
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>

    commit 4bf01ca21e2e0e4561d1a03c48c3d740418702db upstream.

    Make sure to free the rfkill device in case registration fails during
    probe.

    Fixes: 5e7ca3937fbe ("net: rfkill: gpio: convert to resource managed allocation")
    Cc: stable <stable@vger.kernel.org> # 3.13
    Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/rfkill/rfkill-gpio.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/net/rfkill/rfkill-gpio.c
    +++ b/net/rfkill/rfkill-gpio.c
    @@ -140,13 +140,18 @@ static int rfkill_gpio_probe(struct plat

    ret = rfkill_register(rfkill->rfkill_dev);
    if (ret < 0)
    - return ret;
    + goto err_destroy;

    platform_set_drvdata(pdev, rfkill);

    dev_info(&pdev->dev, "%s device registered.\n", rfkill->name);

    return 0;
    +
    +err_destroy:
    + rfkill_destroy(rfkill->rfkill_dev);
    +
    + return ret;
    }

    static int rfkill_gpio_remove(struct platform_device *pdev)

    \
     
     \ /
      Last update: 2018-05-14 09:39    [W:4.274 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site