summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTomas Targownik <ttargownik@geicp.com>2011-06-30 21:30:44 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-30 21:32:52 +0200
commit163f4dabea4e3be485c17e8f08e3a6468ad31cbf (patch)
tree1fab5a250904d550f5c4c8ce206db2da9f89201e /net
parentBluetooth: Fix regression with incoming L2CAP connections (diff)
downloadlinux-163f4dabea4e3be485c17e8f08e3a6468ad31cbf.tar.xz
linux-163f4dabea4e3be485c17e8f08e3a6468ad31cbf.zip
Bluetooth: Fix memory leak under page timeouts
If the remote device is not present, the connections attemp fails and the struct hci_conn was not freed Signed-off-by: Tomas Targownik <ttargownik@geicp.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_conn.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index d3a05b9ade7a..bcd158f40bb9 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -393,6 +393,9 @@ int hci_conn_del(struct hci_conn *conn)
hci_dev_put(hdev);
+ if (conn->handle == 0)
+ kfree(conn);
+
return 0;
}