summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHarout Hedeshian <harouth@codeaurora.org>2015-05-19 16:44:29 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:09:43 -0700
commita511f282c937738fcd8d0be8d1d8df0dd028905e (patch)
tree78995c25e24bd0cc15b188d063ed42259e04e825 /net
parente1f88edd76e19eee1bf0efb3b60a222e32944980 (diff)
net: sockev: corrected sk_family filter logic
Commit 43e0e31e2d6e ("net: sockev: filtering non INET socket events") from Krishnan introduced incorrect conditional logic which caused the socket address families to be incorrectly filtered. This patch corrects the logic. CRs-Fixed: 830947 Cc: Krishnan Ramachandran <kramacha@qti.qualcomm.com> Acked-by: Devesh Bisht <dbisht@qti.qualcomm.com> Change-Id: I40a001a69d5aab25f7f97a7378aceae301fd762a Signed-off-by: Harout Hedeshian <harouth@codeaurora.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/sockev_nlmcast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sockev_nlmcast.c b/net/core/sockev_nlmcast.c
index 7741f1f107cd..16f234e5cb2a 100644
--- a/net/core/sockev_nlmcast.c
+++ b/net/core/sockev_nlmcast.c
@@ -75,7 +75,7 @@ static int sockev_client_cb(struct notifier_block *nb,
if ((socknlmsgsk == NULL) || (sock == NULL) || (sock->sk == NULL))
goto done;
- if (sock->sk->sk_family != AF_INET || sock->sk->sk_family != AF_INET6)
+ if (sock->sk->sk_family != AF_INET && sock->sk->sk_family != AF_INET6)
goto done;
skb = nlmsg_new(sizeof(struct sknlsockevmsg), GFP_KERNEL);