From 2bafb64dc4dae5efb57c50c52f644f5f0b17e55e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sun, 25 Nov 2012 09:44:29 +0000
Subject: [PATCH] --- yaml --- r: 336074 b: refs/heads/master c:
 b49d3c1e1c948d76d64790abe9acffa9fa747d19 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ipmr.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dfc3830bd7c2..40c13f33b04c 100644
--- 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
index 6168c4dc58b1..3eab2b2ffd34 100644
--- 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)) {