From d3d230751a614eb148b2f2db992f01b821706b56 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Fri, 19 Oct 2012 18:45:53 -0700
Subject: [PATCH] --- yaml --- r: 334666 b: refs/heads/master c:
 31fd84b95eb211d5db460a1dda85e004800a7b52 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4f93d0f1a866..c2613d1e04a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c1bee685e6e9e18ed28cba32f0cec0d2e4effee
+refs/heads/master: 31fd84b95eb211d5db460a1dda85e004800a7b52
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 01865c6fb6a0..e6e0ece5f6a0 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1284,7 +1284,7 @@ static int override_release(char __user *release, size_t len)
 			rest++;
 		}
 		v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
-		copy = min(sizeof(buf), max_t(size_t, 1, len));
+		copy = clamp_t(size_t, len, 1, sizeof(buf));
 		copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
 		ret = copy_to_user(release, buf, copy + 1);
 	}