From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 17 Mar 2022 10:57:40 +0300
Subject: Bluetooth: btmtkuart: fix error handling in mtk_hci_wmt_sync()
Patch-mainline: v5.18-rc1
Git-commit: a76d269a4e86cfd7d4441e40adccfa67808fe6fa
References: jsc#PED-1407
This code has an uninitialized variable warning:
drivers/bluetooth/btmtkuart.c:184 mtk_hci_wmt_sync()
error: uninitialized symbol 'wc'.
But it also has error paths which have memory leaks.
Fixes: 8f550f55b155 ("Bluetooth: btmtkuart: rely on BT_MTK module")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
drivers/bluetooth/btmtkuart.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
--- a/drivers/bluetooth/btmtkuart.c
+++ b/drivers/bluetooth/btmtkuart.c
@@ -105,8 +105,10 @@ static int mtk_hci_wmt_sync(struct hci_d
}
wc = kzalloc(hlen, GFP_KERNEL);
- if (!wc)
- return -ENOMEM;
+ if (!wc) {
+ err = -ENOMEM;
+ goto err_free_skb;
+ }
hdr = &wc->hdr;
hdr->dir = 1;
@@ -153,7 +155,7 @@ static int mtk_hci_wmt_sync(struct hci_d
bt_dev_err(hdev, "Wrong op received %d expected %d",
wmt_evt->whdr.op, hdr->op);
err = -EIO;
- goto err_free_skb;
+ goto err_free_wc;
}
switch (wmt_evt->whdr.op) {
@@ -177,11 +179,11 @@ static int mtk_hci_wmt_sync(struct hci_d
if (wmt_params->status)
*wmt_params->status = status;
+err_free_wc:
+ kfree(wc);
err_free_skb:
kfree_skb(bdev->evt_skb);
bdev->evt_skb = NULL;
-err_free_wc:
- kfree(wc);
return err;
}