---

yaml --- r: 336074 b: refs/heads/master c: b49d3c1 h: refs/heads/master v: v3
git-mirror · Nov 26, 2012 · 2bafb64 · 2bafb64
1 parent a80e933
commit 2bafb64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1a676424c290b1c8d757e3860170ac7ecd89af4
+refs/heads/master: b49d3c1e1c948d76d64790abe9acffa9fa747d19
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
@@ -1318,6 +1318,10 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
 		if (get_user(v, (u32 __user *)optval))
 			return -EFAULT;
 
+		/* "pimreg%u" should not exceed 16 bytes (IFNAMSIZ) */
+		if (v != RT_TABLE_DEFAULT && v >= 1000000000)
+			return -EINVAL;
+
 		rtnl_lock();
 		ret = 0;
 		if (sk == rtnl_dereference(mrt->mroute_sk)) {