aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorAnant Thazhemadam <anant.thazhemadam@gmail.com>2020-09-30 00:28:15 +0530
committerMarcel Holtmann <marcel@holtmann.org>2020-11-09 13:09:43 +0100
commit70f259a3f4276b71db365b1d6ff1eab805ea6ec3 (patch)
tree6335200543924fd567f806efa9ffe352a87679f5 /drivers/bluetooth
parentBluetooth: Fix null pointer dereference in hci_event_packet() (diff)
downloadlinux-dev-70f259a3f4276b71db365b1d6ff1eab805ea6ec3.tar.xz
linux-dev-70f259a3f4276b71db365b1d6ff1eab805ea6ec3.zip
Bluetooth: hci_h5: close serdev device and free hu in h5_close
When h5_close() gets called, the memory allocated for the hu gets freed only if hu->serdev doesn't exist. This leads to a memory leak. So when h5_close() is requested, close the serdev device instance and free the memory allocated to the hu entirely instead. Fixes: https://syzkaller.appspot.com/bug?extid=6ce141c55b2f7aafd1c4 Reported-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com Tested-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_h5.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 981d96cc7695..a10d710fc3f1 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -248,8 +248,12 @@ static int h5_close(struct hci_uart *hu)
if (h5->vnd && h5->vnd->close)
h5->vnd->close(h5);
- if (!hu->serdev)
- kfree(h5);
+ if (hu->serdev)
+ serdev_device_close(hu->serdev);
+
+ kfree_skb(h5->rx_skb);
+ kfree(h5);
+ h5 = NULL;
return 0;
}