* [PATCH v2] wifi: brcmfmac: fix memory leak in brcmf_get_module_param
@ 2025-03-30 10:34 Abdun Nihaal
2025-03-30 12:10 ` Markus Elfring
0 siblings, 1 reply; 2+ messages in thread
From: Abdun Nihaal @ 2025-03-30 10:34 UTC (permalink / raw)
To: arend.vanspriel
Cc: kvalo, u.kleine-koenig, jeff.johnson, toke, abdun.nihaal,
jacobe.zang, megi, sebastian.reichel, linux-wireless, brcm80211,
brcm80211-dev-list.pdl, linux-kernel
The memory allocated for settings is not freed when brcmf_of_probe
fails. Fix that by freeing settings before returning in error path.
Fixes: 0ff0843310b7 ("wifi: brcmfmac: Add optional lpo clock enable support")
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
V1 -> V2 : Add subsystem name in commit header as suggested by Arend
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index cfcf01eb0daa..f26e4679e4ff 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -561,8 +561,10 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,
if (!found) {
/* No platform data for this device, try OF and DMI data */
brcmf_dmi_probe(settings, chip, chiprev);
- if (brcmf_of_probe(dev, bus_type, settings) == -EPROBE_DEFER)
+ if (brcmf_of_probe(dev, bus_type, settings) == -EPROBE_DEFER) {
+ kfree(settings);
return ERR_PTR(-EPROBE_DEFER);
+ }
brcmf_acpi_probe(dev, bus_type, settings);
}
return settings;
--
2.47.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] wifi: brcmfmac: fix memory leak in brcmf_get_module_param
2025-03-30 10:34 [PATCH v2] wifi: brcmfmac: fix memory leak in brcmf_get_module_param Abdun Nihaal
@ 2025-03-30 12:10 ` Markus Elfring
0 siblings, 0 replies; 2+ messages in thread
From: Markus Elfring @ 2025-03-30 12:10 UTC (permalink / raw)
To: Abdun Nihaal, brcm80211-dev-list.pdl, brcm80211, linux-wireless,
Arend van Spriel
Cc: LKML, Jacobe Zang, Jeff Johnson, Kalle Valo, Ondřej Jirman,
Sai Krishna, Sebastian Reichel, Toke Høiland-Jørgensen,
Uwe Kleine-König
> The memory allocated for settings is not freed when brcmf_of_probe
> fails. Fix that by freeing settings before returning in error path.
failed?
Would you like to append parentheses to any function names?
Regards,
Markus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-30 12:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-30 10:34 [PATCH v2] wifi: brcmfmac: fix memory leak in brcmf_get_module_param Abdun Nihaal
2025-03-30 12:10 ` Markus Elfring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®