bluetooth: hci_h5: fix memory leak in h5_close
PATCH v5 1/1 bluetooth: hci_h5: fix memory leak in h5_close
When h5_close() is called, h5 is directly freed when !hu->serdev. However, h5->rx_skb is not freed, which causes a memory leak.
Freeing h5->rx_skb and setting it to NULL, fixes this memory leak.
---
Changes in v5:
* Set h5->rx_skb = NULL unconditionally - to improve code readability
* Update commit message accordingly
Changes in v4:
* Free h5->rx_skb even when hu->serdev (Suggested by Hans de Goede <[email protected]>)
* If hu->serdev, then assign h5->rx_skb = NULL
Changes in v3:
* Free h5->rx_skb when !hu->serdev, and fix the memory leak
* Do not incorrectly and unnecessarily call serdev_device_close()
Changes in v2:
* Fixed the Fixes tag
drivers/bluetooth/hci_h5.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/hci_h5.c +3 -0
@@ -245,6 +245,9 @@ static int h5_close(struct hci_uart *hu)skb_queue_purge (&h5->rel);skb_queue_purge (&h5->unrel); +kfree_skb (h5->rx_skb); + h5->rx_skb =NULL ; +if (h5->vnd && h5->vnd->close) h5->vnd->close (h5);
Signature · 1 line
2.25.1
Hi,
Quoted 9 lines · Anant Thazhemadam
When
h5_close()is called, h5 is directly freed when !hu->serdev. However,h5->rx_skbis not freed, which causes a memory leak.Freeing
h5->rx_skband setting it to NULL, fixes this memory leak.Fixes ce945552fde4 ("Bluetooth: hci_h5: Add support for serdev enumerated devices")Reported-by [email protected]Tested-by [email protected]Signed-off-by Anant Thazhemadam <[email protected]>
Patch looks good to me now:
Regards,
Hans
Quoted 37 lines
---
Changes in v5:
* Seth5->rx_skb= NULL unconditionally - to improve code readability
* Update commit message accordinglyChanges in v4:
* Freeh5->rx_skbeven whenhu->serdev(Suggested by Hans de Goede <[email protected]>)
* Ifhu->serdev, then assignh5->rx_skb= NULLChanges in v3:
* Freeh5->rx_skbwhen !hu->serdev, and fix the memory leak
* Do not incorrectly and unnecessarily callserdev_device_close()Changes in v2:
* Fixed the Fixes tagdrivers/bluetooth/hci_h5.c | 3 +++ 1 file changed, 3 insertions(+)drivers/bluetooth/hci_h5.c +3
-0@@ -245,6 +245,9 @@ static int h5_close(struct hci_uart *hu)skb_queue_purge (&h5->rel);skb_queue_purge (&h5->unrel); +kfree_skb (h5->rx_skb); + h5->rx_skb =NULL ; +if (h5->vnd && h5->vnd->close) h5->vnd->close (h5);
Marcel Holtmann
maintainerHi Anant,
Quoted 24 lines
When
h5_close()is called, h5 is directly freed when !hu->serdev. However,h5->rx_skbis not freed, which causes a memory leak.Freeing
h5->rx_skband setting it to NULL, fixes this memory leak.Fixes ce945552fde4 ("Bluetooth: hci_h5: Add support for serdev enumerated devices")Reported-by [email protected]Tested-by [email protected]Signed-off-by Anant Thazhemadam <[email protected]>---
Changes in v5:
* Seth5->rx_skb= NULL unconditionally - to improve code readability
* Update commit message accordinglyChanges in v4:
* Freeh5->rx_skbeven whenhu->serdev(Suggested by Hans de Goede <[email protected]>)
* Ifhu->serdev, then assignh5->rx_skb= NULLChanges in v3:
* Freeh5->rx_skbwhen !hu->serdev, and fix the memory leak
* Do not incorrectly and unnecessarily callserdev_device_close()
Quoted 6 lines
Changes in v2:
* Fixed the Fixes tag
drivers/bluetooth/hci_h5.c| 3 +++1 file changed, 3 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees