Skip to contentSkip to conversation

qtnfmac: pearl: pcie: fix memory leak in qtnf_fw_work_handler

PATCH In review Gustavo A. R. Silva 3 participants 4 messages Apr 5, 2018 – Apr 25, 2018

Subsystems (3)
Networking Network drivers Quantenna qtnfmac wireless driver
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 qtnfmac: pearl: pcie: fix memory leak in qtnf_fw_work_handler

In case memory resources for fw were succesfully allocated, release them before jumping to fw_load_fail.

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

Fixes c3b2f7ca4186 ("qtnfmac: implement asynchronous firmware loading")
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c +4 -0
index f117904..6c1e139 100644
@@ -1185,6 +1185,10 @@ static void qtnf_fw_work_handler(struct work_struct *work)
 	if (qtnf_poll_state(&priv->bda->bda_ep_state, QTN_EP_FW_LOADRDY,
 			    QTN_FW_DL_TIMEOUT_MS)) {
 		pr_err("card is not ready\n");
+
+		if (!flashboot)
+			release_firmware(fw);
+
 		goto fw_load_fail;
 	}
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw

Hello Gustavo,

Quoted 9 lines

In case memory resources for fw were succesfully allocated, release them before jumping to fw_load_fail.

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

Fixes c3b2f7ca4186 ("qtnfmac: implement asynchronous firmware loading")
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 ++++
 1 file changed, 4 insertions(+)

Thanks for the patch!

Reviewed-by Sergey Matyukevich <[email protected]>

Regards,
Sergey

author
#2 lore raw

Hi Sergey,

Quoted 5 lines · Sergey Matyukevich

Hello Gustavo,

Quoted 3 lines

In case memory resources for fw were succesfully allocated, release them before jumping to fw_load_fail.

Quoted 9 lines
Quoted 6 lines

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

Fixes c3b2f7ca4186 ("qtnfmac: implement asynchronous firmware loading")
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
  drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 ++++
  1 file changed, 4 insertions(+)

Thanks for the patch!

Glad to help. :)

Quoted 2 lines
Reviewed-by Sergey Matyukevich <[email protected]>

Thanks
--
Gustavo

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

In case memory resources for fw were succesfully allocated, release them before jumping to fw_load_fail.

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

Fixes c3b2f7ca4186 ("qtnfmac: implement asynchronous firmware loading")
Signed-off-by Gustavo A. R. Silva <[email protected]>
Reviewed-by Sergey Matyukevich <[email protected]>

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

376377004464 qtnfmac: pearl: pcie: fix memory leak in qtnf_fw_work_handler

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

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