Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/sys.c

+2 −1
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ DECLARE_RWSEM(uts_sem); 
/*

 * 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

 * 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)

{
@@ -1127,7 +1128,7 @@ static int override_release(char __user *release, size_t len) 
				break;

			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 = scnprintf(buf, copy, "2.6.%u%s", v, rest);

		ret = copy_to_user(release, buf, copy + 1);