diff options
| author | Anant Thazhemadam <anant.thazhemadam@gmail.com> | 2020-09-30 00:28:15 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-06 14:56:51 +0100 |
| commit | df83b9b674495f4dad6cf9d857095d0432b901e7 (patch) | |
| tree | 97a10cf36ef7ffa10d8a780e14d3ffd3af88b61f | |
| parent | 9d4053cfb3f34038995e94227da4d48941c2ddac (diff) | |
| download | linux-stable-df83b9b674495f4dad6cf9d857095d0432b901e7.tar.gz linux-stable-df83b9b674495f4dad6cf9d857095d0432b901e7.tar.bz2 linux-stable-df83b9b674495f4dad6cf9d857095d0432b901e7.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>
| -rw-r--r-- | drivers/bluetooth/hci_h5.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index 78d635f1d156..376164cdf2ea 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -251,8 +251,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; } |