---

yaml --- r: 166306 b: refs/heads/master c: 0915921 h: refs/heads/master v: v3
git-mirror · Sep 24, 2009 · 84504a9 · 84504a9
1 parent 642a50a
commit 84504a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b3f6af86378d0a10ca2f1ded1da124aef13b62c
+refs/heads/master: 0915921bde4eb5d943b17c175febac58a254d7b6
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
@@ -611,6 +611,9 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 		 *	Check the arguments are allowable
 		 */
 
+		if (optlen < sizeof(struct in_addr))
+			goto e_inval;
+
 		err = -EFAULT;
 		if (optlen >= sizeof(struct ip_mreqn)) {
 			if (copy_from_user(&mreq, optval, sizeof(mreq)))