Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFC: Unlink LLCP child sockets from llcp_sock_release

Browse Source 
The parent socket (the bound one) could be freed before its children, so
we should unlink the children without trying to reach it through the parent.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Samuel Ortiz 2012-03-05 01:03:48 +01:00 committed by John W. Linville
parent 2fbabfa467
commit 0c31835993
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/nfc/llcp/sock.c
View File

@ -327,20 +327,10 @@ static int llcp_sock_release(struct socket *sock)
mutex_lock(&local->socket_lock);
if (llcp_sock == local->sockets[llcp_sock->ssap]) {
if (llcp_sock == local->sockets[llcp_sock->ssap])
local->sockets[llcp_sock->ssap] = NULL;
} else {
struct nfc_llcp_sock *parent, *s, *n;
parent = local->sockets[llcp_sock->ssap];
list_for_each_entry_safe(s, n, &parent->list, list)
if (llcp_sock == s) {
list_del(&s->list);
break;
}
}
else
list_del(&llcp_sock->list);
mutex_unlock(&local->socket_lock);