projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
[cascardo/linux.git]
/
net
/
appletalk
/
ddp.c
diff --git
a/net/appletalk/ddp.c
b/net/appletalk/ddp.c
index
206e771
..
956a530
100644
(file)
--- a/
net/appletalk/ddp.c
+++ b/
net/appletalk/ddp.c
@@
-1051,16
+1051,17
@@
static int atalk_release(struct socket *sock)
{
struct sock *sk = sock->sk;
{
struct sock *sk = sock->sk;
- sock_hold(sk);
- lock_sock(sk);
if (sk) {
if (sk) {
+ sock_hold(sk);
+ lock_sock(sk);
+
sock_orphan(sk);
sock->sk = NULL;
atalk_destroy_socket(sk);
sock_orphan(sk);
sock->sk = NULL;
atalk_destroy_socket(sk);
- }
- release_sock(sk);
- sock_put(sk);
+ release_sock(sk);
+ sock_put(sk);
+ }
return 0;
}
return 0;
}