| From 46936aff0e5262377eb5e69f1475a5e74e45ac18 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 6 Sep 2019 13:26:03 -0500 |
| Subject: ath9k_htc: release allocated buffer if timed out |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit 853acf7caf10b828102d92d05b5c101666a6142b ] |
| |
| In htc_config_pipe_credits, htc_setup_complete, and htc_connect_service |
| if time out happens, the allocated buffer needs to be released. |
| Otherwise there will be memory leak. |
| |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c |
| index d2e062eaf5614..f705f0e1cb5be 100644 |
| --- a/drivers/net/wireless/ath/ath9k/htc_hst.c |
| +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c |
| @@ -173,6 +173,7 @@ static int htc_config_pipe_credits(struct htc_target *target) |
| time_left = wait_for_completion_timeout(&target->cmd_wait, HZ); |
| if (!time_left) { |
| dev_err(target->dev, "HTC credit config timeout\n"); |
| + kfree_skb(skb); |
| return -ETIMEDOUT; |
| } |
| |
| @@ -208,6 +209,7 @@ static int htc_setup_complete(struct htc_target *target) |
| time_left = wait_for_completion_timeout(&target->cmd_wait, HZ); |
| if (!time_left) { |
| dev_err(target->dev, "HTC start timeout\n"); |
| + kfree_skb(skb); |
| return -ETIMEDOUT; |
| } |
| |
| @@ -280,6 +282,7 @@ int htc_connect_service(struct htc_target *target, |
| if (!time_left) { |
| dev_err(target->dev, "Service connection timeout for: %d\n", |
| service_connreq->service_id); |
| + kfree_skb(skb); |
| return -ETIMEDOUT; |
| } |
| |
| -- |
| 2.25.1 |
| |