Skip to contentSkip to conversation

Bluetooth: mediatek: Fix memory leak

PATCH In review Gustavo A. R. Silva 3 participants 4 messages Aug 14, 2018 – Aug 21, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Bluetooth: mediatek: Fix memory leak

In case memory resources for *fw* were allocated, release them before return.

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

Fixes 7237c4c9ec92 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices")
---
 drivers/bluetooth/btmtkuart.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/bluetooth/btmtkuart.c +5 -3
index ed2a5c7..4593baf 100644
@@ -144,8 +144,10 @@ static int mtk_setup_fw(struct hci_dev *hdev)
 	fw_size = fw->size;
 
 	/* The size of patch header is 30 bytes, should be skip */
-	if (fw_size < 30)
-		return -EINVAL;
+	if (fw_size < 30) {
+		err = -EINVAL;
+		goto free_fw;
+	}
 
 	fw_size -= 30;
 	fw_ptr += 30;
@@ -172,8 +174,8 @@ static int mtk_setup_fw(struct hci_dev *hdev)
 		fw_ptr += dlen;
 	}
 
+free_fw:
 	release_firmware(fw);
-
 	return err;
 }
 
Signature · 1 line
2.7.4
maintainer Acked-by on v1 1/1
#1 lore raw

Hi, Gustavo

thanks for the catch up

Quoted 37 lines · Gustavo A. R. Silva

In case memory resources for *fw* were allocated, release them before return.

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

Fixes 7237c4c9ec92 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices")
---
 drivers/bluetooth/btmtkuart.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/bluetooth/btmtkuart.c +5 -3
index ed2a5c7..4593baf 100644
@@ -144,8 +144,10 @@ static int mtk_setup_fw(struct hci_dev *hdev)
 	fw_size = fw->size;
 
 	/* The size of patch header is 30 bytes, should be skip */
-	if (fw_size < 30)
-		return -EINVAL;
+	if (fw_size < 30) {
+		err = -EINVAL;
+		goto free_fw;
+	}
 
 	fw_size -= 30;
 	fw_ptr += 30;
@@ -172,8 +174,8 @@ static int mtk_setup_fw(struct hci_dev *hdev)
 		fw_ptr += dlen;
 	}
 
+free_fw:
 	release_firmware(fw);
-
 	return err;
 }
 
maintainer
#3 lore raw
In reply to Gustavo A. R. Silva

Hi Gustavo,

Quoted 9 lines

In case memory resources for *fw* were allocated, release them before return.

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

Fixes 7237c4c9ec92 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices")

---
drivers/bluetooth/btmtkuart.c | 8 +++++---

1 file changed, 5 insertions(+), 3 deletions(-)

patch has been applied to bluetooth-stable tree.

Regards

Marcel