commit 20c61fbd8deb2ada0ac3acecf6156a986dbfff2d
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Mon Apr 28 14:40:55 2008 +0900
committer YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Thu Jun 12 09:19:08 2008 +0900
tree 0be06a3736b60a6c3586e39dbc43031a2e3dace7
parent 513fd370e6832f81ab717df4645f5ce679e44f14

ipv6 mcast: Check address family of gf_group in getsockopt(MS_FILTER).

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

net/ipv6/ipv6_sockglue.c

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 26b83e5..ce794d6 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -874,6 +874,8 @@
 			return -EINVAL;
 		if (copy_from_user(&gsf, optval, GROUP_FILTER_SIZE(0)))
 			return -EFAULT;
+		if (gsf.gf_group.ss_family != AF_INET6)
+			return -EADDRNOTAVAIL;
 		lock_sock(sk);
 		err = ip6_mc_msfget(sk, &gsf,
 			(struct group_filter __user *)optval, optlen);