aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorLi Wei <lw@cn.fujitsu.com>2012-07-17 15:28:59 +0800
committerDavid S. Miller <davem@davemloft.net>2012-07-17 01:35:03 -0700
commita858d64b7709ca7bd2ee71d66ef3b7190cdcbb7d (patch)
tree363940e9b8d8ffa40624cd9974cc872cab355fd2 /net/ipv6
parentMerge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next (diff)
downloadlinux-dev-a858d64b7709ca7bd2ee71d66ef3b7190cdcbb7d.tar.xz
linux-dev-a858d64b7709ca7bd2ee71d66ef3b7190cdcbb7d.zip
ipv6: fix unappropriate errno returned for non-multicast address
We need to check the passed in multicast address and return appropriate errno(EINVAL) if it is not valid. And it's no need to walk through the ipv6_mc_list in this situation. Signed-off-by: Li Wei <lw@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/mcast.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 6d0f5dc8e3a6..92f8e48e4ba4 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -211,6 +211,9 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
struct ipv6_mc_socklist __rcu **lnk;
struct net *net = sock_net(sk);
+ if (!ipv6_addr_is_multicast(addr))
+ return -EINVAL;
+
spin_lock(&ipv6_sk_mc_lock);
for (lnk = &np->ipv6_mc_list;
(mc_lst = rcu_dereference_protected(*lnk,