---

yaml --- r: 107727 b: refs/heads/master c: cfb266c h: refs/heads/master i: 107725: 758e1a5 107723: b7f0af2 107719: 6a3efa1 107711: 044ad7a v: v3
git-mirror · Aug 4, 2008 · f8c5395 · f8c5395
1 parent 9f7ab77
commit f8c5395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1730554f253deb65fe5112c54b2f898d5318a328
+refs/heads/master: cfb266c0ee0ea0b7bfa8189e3a3a80344dec6112
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
@@ -346,6 +346,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		 */
 		if (optlen == 0)
 			optval = NULL;
+		else if (optval == NULL)
+			goto e_inval;
 		else if (optlen < sizeof(struct ipv6_opt_hdr) ||
 			 optlen & 0x7 || optlen > 8 * 255)
 			goto e_inval;