Commit 31fd84b9 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

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: default avatarFengguang Wu <>
Signed-off-by: default avatarKees Cook <>
Signed-off-by: default avatarLinus Torvalds <>
parent 8c1bee68
......@@ -1284,7 +1284,7 @@ static int override_release(char __user *release, size_t len)
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment