| Message ID | 20180628130809.GA8147@embeddedor.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 04614fe46f315a223d96b8f5df7b52130965677b |
| Delegated to: | Kalle Valo |
| Headers | show |
* Gustavo A. R. Silva <gustavo@embeddedor.com> [180628 13:11]: > 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()") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Thanks for catching this one: Acked-by: Tony Lindgren <tony@atomide.com> > --- > drivers/net/wireless/ti/wlcore/cmd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c > index 836c616..9039687 100644 > --- a/drivers/net/wireless/ti/wlcore/cmd.c > +++ b/drivers/net/wireless/ti/wlcore/cmd.c > @@ -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; > } > -- > 2.7.4 >
On 07/02/2018 06:30 AM, Tony Lindgren wrote: > * Gustavo A. R. Silva <gustavo@embeddedor.com> [180628 13:11]: >> 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()") >> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > > Thanks for catching this one: > > Acked-by: Tony Lindgren <tony@atomide.com> > Glad to help. :) Thanks -- Gustavo
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote: > 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()") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > Acked-by: Tony Lindgren <tony@atomide.com> Patch applied to wireless-drivers-next.git, thanks. 04614fe46f31 wlcore: Fix memory leak in wlcore_cmd_wait_for_event_or_timeout
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c index 836c616..9039687 100644 --- a/drivers/net/wireless/ti/wlcore/cmd.c +++ b/drivers/net/wireless/ti/wlcore/cmd.c @@ -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; }
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()") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/net/wireless/ti/wlcore/cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)