evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "net: sockev: avoid races between sockev and socket_close"

Browse source
This commit is contained in:
Linux Build Service Account 2019-05-20 09:12:58 -07:00 • committed by Gerrit - the friendly Code Review server
commit eddc389f5a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/core/sockev_nlmcast.c
View file

@ -73,11 +73,13 @@ static int sockev_client_cb(struct notifier_block *nb,
sock = (struct socket *)data; sock = (struct socket *)data;
if (!socknlmsgsk || !sock) if (!socknlmsgsk || !sock)
goto done; goto sk_null;
sk = sock->sk; sk = sock->sk;
if (!sk) if (!sk)
goto done; goto sk_null;
sock_hold(sk);
if (sk->sk_family != AF_INET && sk->sk_family != AF_INET6) if (sk->sk_family != AF_INET && sk->sk_family != AF_INET6)
goto done; goto done;
@ -108,6 +110,8 @@ static int sockev_client_cb(struct notifier_block *nb,
smsg->skflags = sk->sk_flags; smsg->skflags = sk->sk_flags;
nlmsg_notify(socknlmsgsk, skb, 0, SKNLGRP_SOCKEV, 0, GFP_KERNEL); nlmsg_notify(socknlmsgsk, skb, 0, SKNLGRP_SOCKEV, 0, GFP_KERNEL);
done: done:
sock_put(sk);
sk_null:
return 0; return 0;
} }