2016-03-10 04:55:30

by Raja Mani

Subject: [PATCH] ath10k: free cached fw bin contents when get board id fails

ath10k_core_probe_fw() simply returns error without freeing
cached firmware file content when get board id operation fails.
Free cached fw bin data in failure case to avoid memory leak.

Fixes: db0984e51a18 ("ath10k: select board data based on BMI chip id and board id")
Signed-off-by: Raja Mani <[email protected]>
---
drivers/net/wireless/ath/ath10k/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 4d31764..a76d8ac 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1833,7 +1833,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
if (ret && ret != -EOPNOTSUPP) {
ath10k_err(ar, "failed to get board id from otp: %d\n",
ret);
- return ret;
+ goto err_free_firmware_files;
}

ret = ath10k_core_fetch_board_file(ar);
--
1.8.1.2

2016-03-18 07:54:51

by Kalle Valo

Subject: Re: [PATCH] ath10k: free cached fw bin contents when get board id fails

Raja Mani <[email protected]> writes:

> ath10k_core_probe_fw() simply returns error without freeing
> cached firmware file content when get board id operation fails.
> Free cached fw bin data in failure case to avoid memory leak.
>
> Fixes: db0984e51a18 ("ath10k: select board data based on BMI chip id and board id")
> Signed-off-by: Raja Mani <[email protected]>

Applied, thanks.

--
Kalle Valo