From 1c5194459b4f95382b977d0ef9d0983bdcd1f8b1 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 26 Jun 2014 12:51:16 -0600 Subject: [PATCH] Revert "use clamp_t in UNAME26 fix" This reverts commit 9ffe27c55e659c8e87a76b1b4919bdda669512eb. Preperatory to re-application with the correct upstream SHA1. Signed-off-by: Tim Gardner --- kernel/sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sys.c b/kernel/sys.c index ce7e1e638de..0f9ed65dc0c 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1200,7 +1200,7 @@ static int override_release(char __user *release, size_t len) rest++; } v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40; - copy = clamp_t(size_t, len, 1, sizeof(buf)); + copy = min(sizeof(buf), max_t(size_t, 1, len)); copy = scnprintf(buf, copy, "2.6.%u%s", v, rest); ret = copy_to_user(release, buf, copy + 1); }