---

yaml --- r: 349290 b: refs/heads/master c: 75356a8 h: refs/heads/master v: v3
git-mirror · Jan 28, 2013 · 3761afb · 3761afb
1 parent c8b13a8
commit 3761afb
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: ce11ff5e5963e441feb591e76278528f876c332d
+refs/heads/master: 75356a8143426a1301bc66c4fb920dcb1bd5e934
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
@@ -1710,6 +1710,9 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
 			return -EINVAL;
 		if (get_user(v, (u32 __user *)optval))
 			return -EFAULT;
+		/* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */
+		if (v != RT_TABLE_DEFAULT && v >= 100000000)
+			return -EINVAL;
 		if (sk == mrt->mroute6_sk)
 			return -EBUSY;