---

yaml
---
r: 90639
b: refs/heads/master
c: a28398b
h: refs/heads/master
i:
  90637: c557724
  90635: b92bd93
  90631: 815f769
  90623: f004633
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8
+refs/heads/master: a28398ba6112be28c6a92aacf06aca1979b454b7

trunk/net/ipv6/ipv6_sockglue.c

@@ -449,6 +449,9 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 	{
 		struct ipv6_mreq mreq;
 
+		if (optlen < sizeof(struct ipv6_mreq))
+			goto e_inval;
+
 		retv = -EPROTO;
 		if (inet_sk(sk)->is_icsk)
 			break;
@@ -468,7 +471,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 	{
 		struct ipv6_mreq mreq;
 
-		if (optlen != sizeof(struct ipv6_mreq))
+		if (optlen < sizeof(struct ipv6_mreq))
 			goto e_inval;
 
 		retv = -EFAULT;
@@ -487,6 +490,9 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		struct group_req greq;
 		struct sockaddr_in6 *psin6;
 
+		if (optlen < sizeof(struct group_req))
+			goto e_inval;
+
 		retv = -EFAULT;
 		if (copy_from_user(&greq, optval, sizeof(struct group_req)))
 			break;
@@ -511,7 +517,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		struct group_source_req greqs;
 		int omode, add;
 
-		if (optlen != sizeof(struct group_source_req))
+		if (optlen < sizeof(struct group_source_req))
 			goto e_inval;
 		if (copy_from_user(&greqs, optval, sizeof(greqs))) {
 			retv = -EFAULT;