| From: Johan Hovold <johan@kernel.org> |
| Date: Thu, 26 Apr 2018 09:31:52 +0200 |
| Subject: rfkill: gpio: fix memory leak in probe error path |
| |
| 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: 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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| 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 |
| @@ -134,13 +134,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) |
