summaryrefslogtreecommitdiff
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorAnant Thazhemadam <anant.thazhemadam@gmail.com>2020-09-30 00:28:15 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-06 14:48:38 +0100
commit18e1101b0ee9b9f2483e0efd0dcf3763b3915026 (patch)
tree85b0bf9f45d3cee5b48f476c93ef72783097fa5d /drivers/bluetooth
parentb726f86022076ceaedb0bbfa2e7a2c975b569608 (diff)
downloadlinux-18e1101b0ee9b9f2483e0efd0dcf3763b3915026.tar.gz
linux-18e1101b0ee9b9f2483e0efd0dcf3763b3915026.tar.bz2
linux-18e1101b0ee9b9f2483e0efd0dcf3763b3915026.zip
Bluetooth: hci_h5: close serdev device and free hu in h5_close
commit 70f259a3f4276b71db365b1d6ff1eab805ea6ec3 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 e11af747395d..17b0f1b793ec 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -250,8 +250,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;
}