aboutsummaryrefslogtreecommitdiff
path: root/net/ipx
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-03-21 18:16:39 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-21 18:16:39 -0700
commit674f2115995b7b588cbf3540c9f9b2448a8c7ea8 (patch)
treebd9bd1afa880531f6de70bea970aa198924f8632 /net/ipx
parent20246a800389fe5442675c59863fec5a4f520c7c (diff)
downloadlinux-stericsson-674f2115995b7b588cbf3540c9f9b2448a8c7ea8.tar.gz
ipx: fix ipx_release()
Commit b0d0d915d1d1a0 (remove the BKL) added a regression, because sock_put() can free memory while we are going to use it later. Fix is to delay sock_put() _after_ release_sock(). Reported-by: Ingo Molnar <mingo@elte.hu> Tested-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx')
-rw-r--r--net/ipx/af_ipx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 2731b51923d1..9680226640ef 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -148,7 +148,6 @@ static void ipx_destroy_socket(struct sock *sk)
ipx_remove_socket(sk);
skb_queue_purge(&sk->sk_receive_queue);
sk_refcnt_debug_dec(sk);
- sock_put(sk);
}
/*
@@ -1404,6 +1403,7 @@ static int ipx_release(struct socket *sock)
sk_refcnt_debug_release(sk);
ipx_destroy_socket(sk);
release_sock(sk);
+ sock_put(sk);
out:
return 0;
}