From 3761afbf56213c017760a26700150de858e2a79f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 23 Jan 2013 20:38:34 +0000
Subject: [PATCH] --- yaml --- r: 349290 b: refs/heads/master c:
 75356a8143426a1301bc66c4fb920dcb1bd5e934 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/ip6mr.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 511e0a325fd1..a8783e750bbe 100644
--- 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
index 26dcdec9e3a5..8fd154e5f079 100644
--- 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;