ipx: fix ipx_release()
Commit b0d0d915d1
(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>
This commit is contained in:
parent
20246a8003
commit
674f211599
|
@ -148,7 +148,6 @@ static void ipx_destroy_socket(struct sock *sk)
|
||||||
ipx_remove_socket(sk);
|
ipx_remove_socket(sk);
|
||||||
skb_queue_purge(&sk->sk_receive_queue);
|
skb_queue_purge(&sk->sk_receive_queue);
|
||||||
sk_refcnt_debug_dec(sk);
|
sk_refcnt_debug_dec(sk);
|
||||||
sock_put(sk);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1404,6 +1403,7 @@ static int ipx_release(struct socket *sock)
|
||||||
sk_refcnt_debug_release(sk);
|
sk_refcnt_debug_release(sk);
|
||||||
ipx_destroy_socket(sk);
|
ipx_destroy_socket(sk);
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
|
sock_put(sk);
|
||||||
out:
|
out:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue