* [PATCH] rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info()
@ 2016-08-09 19:19 Christian Engelmayer
2016-08-10 14:10 ` Larry Finger
2016-09-03 16:52 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Christian Engelmayer @ 2016-08-09 19:19 UTC (permalink / raw)
To: Larry.Finger, chaoming_li
Cc: kvalo, arnd, linux-wireless, Christian Engelmayer
In case rtl_get_hwinfo() fails, the function directly returns and leaks the
already allocated hwinfo memory. Go through the correct exit path.
Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
---
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
index b0f632462335..57205514801c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
@@ -1757,7 +1757,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
return;
if (rtl_get_hwinfo(hw, rtlpriv, HWSET_MAX_SIZE, hwinfo, params))
- return;
+ goto exit;
_rtl92de_efuse_update_chip_version(hw);
_rtl92de_read_macphymode_and_bandtype(hw, hwinfo);
@@ -1790,6 +1790,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
break;
}
rtlefuse->txpwr_fromeprom = true;
+exit:
kfree(hwinfo);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info()
2016-08-09 19:19 [PATCH] rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info() Christian Engelmayer
@ 2016-08-10 14:10 ` Larry Finger
2016-09-03 16:52 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Larry Finger @ 2016-08-10 14:10 UTC (permalink / raw)
To: Christian Engelmayer, chaoming_li; +Cc: kvalo, arnd, linux-wireless
On 08/09/2016 02:19 PM, Christian Engelmayer wrote:
> In case rtl_get_hwinfo() fails, the function directly returns and leaks the
> already allocated hwinfo memory. Go through the correct exit path.
>
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> ---
> drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
This patch looks good. Thanks.
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
> index b0f632462335..57205514801c 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
> @@ -1757,7 +1757,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
> return;
>
> if (rtl_get_hwinfo(hw, rtlpriv, HWSET_MAX_SIZE, hwinfo, params))
> - return;
> + goto exit;
>
> _rtl92de_efuse_update_chip_version(hw);
> _rtl92de_read_macphymode_and_bandtype(hw, hwinfo);
> @@ -1790,6 +1790,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
> break;
> }
> rtlefuse->txpwr_fromeprom = true;
> +exit:
> kfree(hwinfo);
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info()
2016-08-09 19:19 [PATCH] rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info() Christian Engelmayer
2016-08-10 14:10 ` Larry Finger
@ 2016-09-03 16:52 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2016-09-03 16:52 UTC (permalink / raw)
To: Christian Engelmayer
Cc: Larry.Finger, chaoming_li, arnd, linux-wireless,
Christian Engelmayer
Christian Engelmayer <cengelma@gmx.at> wrote:
> In case rtl_get_hwinfo() fails, the function directly returns and leaks the
> already allocated hwinfo memory. Go through the correct exit path.
>
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Thanks, 1 patch applied to wireless-drivers-next.git:
a0c7858e7479 rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info()
--
Sent by pwcli
https://patchwork.kernel.org/patch/9272131/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-03 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-09 19:19 [PATCH] rtlwifi: rtl8192de: Fix leak in _rtl92de_read_adapter_info() Christian Engelmayer
2016-08-10 14:10 ` Larry Finger
2016-09-03 16:52 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).