summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2022-03-17 08:57:40 +0100
committerMarcel Holtmann <marcel@holtmann.org>2022-03-18 17:12:08 +0100
commita76d269a4e86cfd7d4441e40adccfa67808fe6fa (patch)
tree620c01566e0c28d5db5bba1cc97df90666f92b57 /drivers/bluetooth
parentBluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed (diff)
downloadlinux-a76d269a4e86cfd7d4441e40adccfa67808fe6fa.tar.xz
linux-a76d269a4e86cfd7d4441e40adccfa67808fe6fa.zip
Bluetooth: btmtkuart: fix error handling in mtk_hci_wmt_sync()
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>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btmtkuart.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c
index 695e1225b08c..c98691cdbbd5 100644
--- a/drivers/bluetooth/btmtkuart.c
+++ b/drivers/bluetooth/btmtkuart.c
@@ -105,8 +105,10 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev,
}
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_dev *hdev,
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_dev *hdev,
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;
}