Commit 39afb5ee authored by Jon DeVree's avatar Jon DeVree Committed by Linus Torvalds

kernel/sys.c: fix UNAME26 for 4.0

There's a uname workaround for broken userspace which can't handle kernel
versions of 3.x.  Update it for 4.x.
Signed-off-by: default avatarJon DeVree <nuxi@vault24.org>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2973697
...@@ -1108,6 +1108,7 @@ DECLARE_RWSEM(uts_sem); ...@@ -1108,6 +1108,7 @@ DECLARE_RWSEM(uts_sem);
/* /*
* Work around broken programs that cannot handle "Linux 3.0". * Work around broken programs that cannot handle "Linux 3.0".
* Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40 * Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40
* And we map 4.x to 2.6.60+x, so 4.0 would be 2.6.60.
*/ */
static int override_release(char __user *release, size_t len) static int override_release(char __user *release, size_t len)
{ {
...@@ -1127,7 +1128,7 @@ static int override_release(char __user *release, size_t len) ...@@ -1127,7 +1128,7 @@ static int override_release(char __user *release, size_t len)
break; break;
rest++; rest++;
} }
v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40; v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 60;
copy = clamp_t(size_t, len, 1, sizeof(buf)); copy = clamp_t(size_t, len, 1, sizeof(buf));
copy = scnprintf(buf, copy, "2.6.%u%s", v, rest); copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
ret = copy_to_user(release, buf, copy + 1); 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