From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbcHAKmi (ORCPT ); Mon, 1 Aug 2016 06:42:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60230 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752102AbcHAKm2 (ORCPT ); Mon, 1 Aug 2016 06:42:28 -0400 Date: Mon, 1 Aug 2016 03:37:25 -0700 From: tip-bot for David Howells Message-ID: Cc: mingo@kernel.org, jpoimboe@redhat.com, dhowells@redhat.com, dvlasenk@redhat.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, bp@alien8.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, smueller@chronox.de Reply-To: hpa@zytor.com, smueller@chronox.de, dvlasenk@redhat.com, dhowells@redhat.com, mingo@kernel.org, jpoimboe@redhat.com, peterz@infradead.org, tglx@linutronix.de, luto@kernel.org, bp@alien8.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <146961615805.14395.5581949237156769439.stgit@warthog.procyon.org.uk> References: <146961615805.14395.5581949237156769439.stgit@warthog.procyon.org.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace Git-Commit-ID: f7d665627e103e82d34306c7d3f6f46f387c0d8b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f7d665627e103e82d34306c7d3f6f46f387c0d8b Gitweb: http://git.kernel.org/tip/f7d665627e103e82d34306c7d3f6f46f387c0d8b Author: David Howells AuthorDate: Wed, 27 Jul 2016 11:42:38 +0100 Committer: Ingo Molnar CommitDate: Mon, 1 Aug 2016 11:31:24 +0200 x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace x86_64 needs to use compat_sys_keyctl for 32-bit userspace rather than calling sys_keyctl(). The latter will work in a lot of cases, thereby hiding the issue. Reported-by: Stephan Mueller Tested-by: Stephan Mueller Signed-off-by: David Howells Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/146961615805.14395.5581949237156769439.stgit@warthog.procyon.org.uk Signed-off-by: Ingo Molnar --- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 4cddd17..f848572 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -294,7 +294,7 @@ # 285 sys_setaltroot 286 i386 add_key sys_add_key 287 i386 request_key sys_request_key -288 i386 keyctl sys_keyctl +288 i386 keyctl sys_keyctl compat_sys_keyctl 289 i386 ioprio_set sys_ioprio_set 290 i386 ioprio_get sys_ioprio_get 291 i386 inotify_init sys_inotify_init