| From 501dac2851c5bf1edf158adc4deb15e10c59bb04 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Wed, 11 Apr 2012 11:24:35 +0200 |
| Subject: Bluetooth: uart-ldisc: Fix memory leak |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| This is a partial, self-contained, minimal backport of commit |
| 797fe796c4335b35d95d5326824513befdb5d1e9 upstream which fixes the memory |
| leak: |
| |
| Bluetooth: uart-ldisc: Fix memory leak and remove destruct cb |
| |
| We currently leak the hci_uart object if HCI_UART_PROTO_SET is never set |
| because the hci-destruct callback will then never be called. This fix |
| removes the hci-destruct callback and frees the driver internal private |
| hci_uart object directly on tty-close. We call hci_unregister_dev() here |
| so the hci-core will never call our callbacks again (except destruct). |
| Therefore, we can safely free the driver internal data right away and |
| set the destruct callback to NULL. |
| |
| Signed-off-by: David Herrmann <dh.herrmann@googlemail.com> |
| Acked-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/bluetooth/hci_ldisc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/bluetooth/hci_ldisc.c |
| +++ b/drivers/bluetooth/hci_ldisc.c |
| @@ -237,7 +237,6 @@ static void hci_uart_destruct(struct hci |
| return; |
| |
| BT_DBG("%s", hdev->name); |
| - kfree(hdev->driver_data); |
| } |
| |
| /* ------ LDISC part ------ */ |
| @@ -316,6 +315,7 @@ static void hci_uart_tty_close(struct tt |
| hci_free_dev(hdev); |
| } |
| } |
| + kfree(hu); |
| } |
| } |
| |
