projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d08fd0e
)
Bluetooth: Fix socket not getting freed if l2cap channel create fails
author
Jaganath Kanakkassery
<
[email protected]
>
Thu, 19 Jul 2012 07:24:04 +0000
(12:54 +0530)
committer
Gustavo Padovan
<
[email protected]
>
Mon, 6 Aug 2012 18:19:37 +0000
(15:19 -0300)
If l2cap_chan_create() fails then it will return from l2cap_sock_kill
since zapped flag of sk is reset.
Signed-off-by: Jaganath Kanakkassery <
[email protected]
>
Signed-off-by: Gustavo Padovan <
[email protected]
>
net/bluetooth/l2cap_sock.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_sock.c
b/net/bluetooth/l2cap_sock.c
index a4bb27e8427e9aabaa48b90727cb23bcf5568f96..b94abd30e6f948a4ebe0a72fef5a157eb24d40fb 100644
(file)
--- a/
net/bluetooth/l2cap_sock.c
+++ b/
net/bluetooth/l2cap_sock.c
@@
-1174,7
+1174,7
@@
static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p
chan = l2cap_chan_create();
if (!chan) {
-
l2cap_sock_kill
(sk);
+
sk_free
(sk);
return NULL;
}