* Re: [PATCH] staging: wfx: fix the error handling in wfx_init_common()
[not found] <tencent_A552D77F0E081BB36EAE11C720455D78BD06@qq.com>
@ 2022-02-17 15:36 ` Greg KH
0 siblings, 0 replies; only message in thread
From: Greg KH @ 2022-02-17 15:36 UTC (permalink / raw)
To: xkernel.wang; +Cc: jerome.pouiller, linux-staging, linux-kernel
On Thu, Feb 17, 2022 at 11:29:06PM +0800, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> All the error handlers of wfx_init_common() return without calling
> ieee80211_free_hw(hw), which may result in memory leak. So I add
> one err label to unify the error handlers.
>
> Suggested-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
> ---
> drivers/staging/wfx/main.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c
> index 4b9fdf9..f83df9f 100644
> --- a/drivers/staging/wfx/main.c
> +++ b/drivers/staging/wfx/main.c
> @@ -309,7 +309,8 @@ struct wfx_dev *wfx_init_common(struct device *dev,
> wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup",
> GPIOD_OUT_LOW);
> if (IS_ERR(wdev->pdata.gpio_wakeup))
> - return NULL;
> + goto err;
> +
> if (wdev->pdata.gpio_wakeup)
> gpiod_set_consumer_name(wdev->pdata.gpio_wakeup, "wfx wakeup");
>
> @@ -325,9 +326,13 @@ struct wfx_dev *wfx_init_common(struct device *dev,
> wdev->force_ps_timeout = -1;
>
> if (devm_add_action_or_reset(dev, wfx_free_common, wdev))
> - return NULL;
> + goto err;
>
> return wdev;
> +
> +err:
> + ieee80211_free_hw(hw);
> + return NULL;
> }
>
> int wfx_probe(struct wfx_dev *wdev)
> --
Please make this a patch series, properly numbered, and not 2 individual
and separate patches as the second one relies on this one, yet that it
not conveyed to anyone at all :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] only message in thread