From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979AbbBWTAo (ORCPT ); Mon, 23 Feb 2015 14:00:44 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:42953 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbbBWTAn (ORCPT ); Mon, 23 Feb 2015 14:00:43 -0500 Date: Mon, 23 Feb 2015 11:00:41 -0800 From: Andrew Morton To: Jon DeVree Cc: linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH] kernel/sys.c: Fix UNAME26 for 4.0 Message-Id: <20150223110041.eaa2d7e6e1e54e11e1f9e945@linux-foundation.org> In-Reply-To: <1424670192-3215-1-git-send-email-nuxi@vault24.org> References: <1424670192-3215-1-git-send-email-nuxi@vault24.org> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 23 Feb 2015 00:43:12 -0500 Jon DeVree wrote: > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@ -1127,7 +1127,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); Huh. I wonder if we still need this. We should update the comment: --- a/kernel/sys.c~kernel-sysc-fix-uname26-for-40-fix +++ a/kernel/sys.c @@ -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) {