diff options
| author | Kees Cook | 2012-10-20 03:45:53 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-20 03:51:17 +0200 |
| commit | 31fd84b95eb211d5db460a1dda85e004800a7b52 (patch) | |
| tree | ff1a3c181f16696c4b2d1059bd9f70b6d5cbda13 /kernel | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | kernel-qcow2-linux-31fd84b95eb211d5db460a1dda85e004800a7b52.tar.gz kernel-qcow2-linux-31fd84b95eb211d5db460a1dda85e004800a7b52.tar.xz kernel-qcow2-linux-31fd84b95eb211d5db460a1dda85e004800a7b52.zip | |
use clamp_t in UNAME26 fix
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 01865c6fb6a0..e6e0ece5f6a0 100644 --- a/kernel/sys.c +++ b/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); } |