Merge "net: sockev: avoid races between sockev and socket_close" (4ded928c) · Commits · e / devices / android_kernel_fairphone_FP3

net/core/sockev_nlmcast.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -72,11 +72,13 @@ static int sockev_client_cb(struct notifier_block *nb,

		sock = (struct socket *)data;
		if (!socknlmsgsk \|\| !sock)
		goto done;
		goto sk_null;

		sk = sock->sk;
		if (!sk)
		goto done;
		goto sk_null;

		sock_hold(sk);

		if (sk->sk_family != AF_INET && sk->sk_family != AF_INET6)
		goto done;
		@@ -109,6 +111,8 @@ static int sockev_client_cb(struct notifier_block *nb,
		smsg->skflags = sk->sk_flags;
		nlmsg_notify(socknlmsgsk, skb, 0, SKNLGRP_SOCKEV, 0, GFP_KERNEL);
		done:
		sock_put(sk);
		sk_null:
		return 0;
		}