[PATCH] ipv6: fix unappropriate errno returned for non-multicast address

[PATCH] ipv6: fix unappropriate errno returned for non-multicast address

[Li Wei]

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>
---
 net/ipv6/mcast.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 6d0f5dc..92f8e48 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,
-- 
1.7.1

Re: [PATCH] ipv6: fix unappropriate errno returned for non-multicast address

[David Miller]

From: Li Wei <lw@cn.fujitsu.com>
Date: Tue, 17 Jul 2012 15:28:59 +0800

> 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>

Applied to net-next, thanks.