Skip to contentSkip to conversation

wlcore: Fix memory leak in wlcore_cmd_wait_for_event_or_timeout

PATCH In review Gustavo A. R. Silva 3 participants 4 messages Jun 28, 2018 – Jul 4, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wlcore: Fix memory leak in wlcore_cmd_wait_for_event_or_timeout

In case memory resources for *events_vector* were allocated, release them before return.

Addresses-Coverity-ID: 1470194 ("Resource leak")

Fixes 4ec7cece87b3 ("wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()")
---
 drivers/net/wireless/ti/wlcore/cmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ti/wlcore/cmd.c +0 -0
index 836c616..9039687 100644
@@ -195,8 +195,7 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
 	ret = pm_runtime_get_sync(wl->dev);
 	if (ret < 0) {
 		pm_runtime_put_noidle(wl->dev);
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Gustavo A. R. Silva

In case memory resources for *events_vector* were allocated, release them before return.

Addresses-Coverity-ID: 1470194 ("Resource leak")

Fixes 4ec7cece87b3 ("wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()")

Thanks for catching this one:

Quoted 29 lines
---
 drivers/net/wireless/ti/wlcore/cmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ti/wlcore/cmd.c +2 -2
index 836c616..9039687 100644
@@ -195,8 +195,7 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
 	ret = pm_runtime_get_sync(wl->dev);
 	if (ret < 0) {
 		pm_runtime_put_noidle(wl->dev);
-
-		return ret;
+		goto free_vector;
 	}
 
 	do {
@@ -232,6 +231,7 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
 out:
 	pm_runtime_mark_last_busy(wl->dev);
 	pm_runtime_put_autosuspend(wl->dev);
+free_vector:
 	kfree(events_vector);
 	return ret;
 }
Signature · 1 line
2.7.4
#2 lore raw
Quoted 4 lines · Tony Lindgren
Quoted 3 lines · Gustavo A. R. Silva

In case memory resources for *events_vector* were allocated, release them before return.

Quoted 8 lines
Quoted 3 lines

Addresses-Coverity-ID: 1470194 ("Resource leak")

Fixes 4ec7cece87b3 ("wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()")

Thanks for catching this one:

Glad to help. :)

Thanks
--
Gustavo

#3 lore raw
In reply to Gustavo A. R. Silva
Quoted 7 lines · Gustavo A. R. Silva

In case memory resources for *events_vector* were allocated, release them before return.

Addresses-Coverity-ID: 1470194 ("Resource leak")

Fixes 4ec7cece87b3 ("wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()")

Patch applied to wireless-drivers-next.git, thanks.

04614fe46f31 wlcore: Fix memory leak in wlcore_cmd_wait_for_event_or_timeout

Signature · 3 lines
https://patchwork.kernel.org/patch/10493849/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches