aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-19 18:45:53 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-28 10:02:11 -0700
commit2f3dc85d233fce3345eb1880ec44349d7b290211 (patch)
treeb15e3448749649c25d412ea4eb6e4f23a861b79d /kernel
parent58793e9b6ba06d22ce9cf444d190568157c858c9 (diff)
downloadkernel_samsung_crespo-2f3dc85d233fce3345eb1880ec44349d7b290211.zip
kernel_samsung_crespo-2f3dc85d233fce3345eb1880ec44349d7b290211.tar.gz
kernel_samsung_crespo-2f3dc85d233fce3345eb1880ec44349d7b290211.tar.bz2
use clamp_t in UNAME26 fix
commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream. The min/max call needed to have explicit types on some architectures (e.g. mn10300). Use clamp_t instead to avoid the warning: kernel/sys.c: In function 'override_release': kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default] Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 46ca435..84e353b 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1152,7 +1152,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);
}