2015-06-01 09:24:21

by Raja Mani

Subject: [PATCH] ath10k: free wmi mgmt event skb when parsing fails

When wmi mgmt event function fails to parse given skb,
it should be freed on failure condition to avoid memory
leaks. Found this during the code review.

Signed-off-by: Raja Mani <[email protected]>
---
drivers/net/wireless/ath/ath10k/wmi.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index b892eb8..818bd25 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2089,6 +2089,7 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
ret = ath10k_wmi_pull_mgmt_rx(ar, skb, &arg);
if (ret) {
ath10k_warn(ar, "failed to parse mgmt rx event: %d\n", ret);
+ dev_kfree_skb(skb);
return ret;
}

--
1.7.10.4

2015-06-01 09:34:12

by Michal Kazior

Subject: Re: [PATCH] ath10k: free wmi mgmt event skb when parsing fails

On 1 June 2015 at 11:23, Raja Mani <[email protected]> wrote:
> When wmi mgmt event function fails to parse given skb,
> it should be freed on failure condition to avoid memory
> leaks. Found this during the code review.
>
> Signed-off-by: Raja Mani <[email protected]>
> ---
> drivers/net/wireless/ath/ath10k/wmi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
> index b892eb8..818bd25 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -2089,6 +2089,7 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
> ret = ath10k_wmi_pull_mgmt_rx(ar, skb, &arg);
> if (ret) {
> ath10k_warn(ar, "failed to parse mgmt rx event: %d\n", ret);
> + dev_kfree_skb(skb);
> return ret;
> }

Good catch! Looks good to me.


Michał

2015-06-09 10:52:54

by Kalle Valo

Subject: Re: [PATCH] ath10k: free wmi mgmt event skb when parsing fails

Raja Mani <[email protected]> writes:

> When wmi mgmt event function fails to parse given skb,
> it should be freed on failure condition to avoid memory
> leaks. Found this during the code review.
>
> Signed-off-by: Raja Mani <[email protected]>

Thanks, applied.

--
Kalle Valo