Commit c100c8f4 authored Mar 31, 2011 by David S. Miller

appletalk: Fix OOPS in atalk_release().



Commit 60d9f461 ("appletalk: remove
the BKL") added a dereference of "sk" before checking for NULL in
atalk_release().

Guard the code block completely, rather than partially, with the
NULL check.

Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c3794745

net/appletalk/ddp.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1051,16 +1051,17 @@ static int atalk_release(struct socket *sock)
		{
		struct sock *sk = sock->sk;

		if (sk) {
		sock_hold(sk);
		lock_sock(sk);
		if (sk) {

		sock_orphan(sk);
		sock->sk = NULL;
		atalk_destroy_socket(sk);
		}

		release_sock(sk);
		sock_put(sk);

		}
		return 0;
		}