From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426805AbcBRU1B (ORCPT ); Thu, 18 Feb 2016 15:27:01 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47305 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426732AbcBRU06 (ORCPT ); Thu, 18 Feb 2016 15:26:58 -0500 Date: Thu, 18 Feb 2016 12:25:54 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, brgerst@gmail.com, bp@alien8.de, hpa@zytor.com, riel@redhat.com, torvalds@linux-foundation.org, dave.hansen@linux.intel.com, luto@amacapital.net, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, dave@sr71.net, dvlasenk@redhat.com, tglx@linutronix.de Reply-To: riel@redhat.com, torvalds@linux-foundation.org, brgerst@gmail.com, hpa@zytor.com, bp@alien8.de, mingo@kernel.org, peterz@infradead.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, dave@sr71.net, tglx@linutronix.de, luto@amacapital.net, dave.hansen@linux.intel.com, akpm@linux-foundation.org In-Reply-To: <20160212210232.774EEAAB@viggo.jf.intel.com> References: <20160212210232.774EEAAB@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:mm/pkeys] mm/core, x86/mm/pkeys: Add arch_validate_pkey() Git-Commit-ID: 66d375709d2c891acc639538fd3179fa0cbb0daf 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: 66d375709d2c891acc639538fd3179fa0cbb0daf Gitweb: http://git.kernel.org/tip/66d375709d2c891acc639538fd3179fa0cbb0daf Author: Dave Hansen AuthorDate: Fri, 12 Feb 2016 13:02:32 -0800 Committer: Ingo Molnar CommitDate: Thu, 18 Feb 2016 19:46:31 +0100 mm/core, x86/mm/pkeys: Add arch_validate_pkey() The syscall-level code is passed a protection key and need to return an appropriate error code if the protection key is bogus. We will be using this in subsequent patches. Note that this also begins a series of arch-specific calls that we need to expose in otherwise arch-independent code. We create a linux/pkeys.h header where we will put *all* the stubs for these functions. Signed-off-by: Dave Hansen Reviewed-by: Thomas Gleixner Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rik van Riel Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20160212210232.774EEAAB@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 1 + arch/x86/include/asm/pkeys.h | 6 ++++++ include/linux/pkeys.h | 25 +++++++++++++++++++++++++ mm/Kconfig | 2 ++ 4 files changed, 34 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b875434..eda18ce 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -156,6 +156,7 @@ config X86 select X86_DEV_DMA_OPS if X86_64 select X86_FEATURE_NAMES if PROC_FS select ARCH_USES_HIGH_VMA_FLAGS if X86_INTEL_MEMORY_PROTECTION_KEYS + select ARCH_HAS_PKEYS if X86_INTEL_MEMORY_PROTECTION_KEYS config INSTRUCTION_DECODER def_bool y diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h new file mode 100644 index 0000000..04243c2 --- /dev/null +++ b/arch/x86/include/asm/pkeys.h @@ -0,0 +1,6 @@ +#ifndef _ASM_X86_PKEYS_H +#define _ASM_X86_PKEYS_H + +#define arch_max_pkey() (boot_cpu_has(X86_FEATURE_OSPKE) ? 16 : 1) + +#endif /*_ASM_X86_PKEYS_H */ diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h new file mode 100644 index 0000000..55e465f --- /dev/null +++ b/include/linux/pkeys.h @@ -0,0 +1,25 @@ +#ifndef _LINUX_PKEYS_H +#define _LINUX_PKEYS_H + +#include +#include + +#ifdef CONFIG_ARCH_HAS_PKEYS +#include +#else /* ! CONFIG_ARCH_HAS_PKEYS */ +#define arch_max_pkey() (1) +#endif /* ! CONFIG_ARCH_HAS_PKEYS */ + +/* + * This is called from mprotect_pkey(). + * + * Returns true if the protection keys is valid. + */ +static inline bool validate_pkey(int pkey) +{ + if (pkey < 0) + return false; + return (pkey < arch_max_pkey()); +} + +#endif /* _LINUX_PKEYS_H */ diff --git a/mm/Kconfig b/mm/Kconfig index 6cf4399..2702bb6 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -672,3 +672,5 @@ config FRAME_VECTOR config ARCH_USES_HIGH_VMA_FLAGS bool +config ARCH_HAS_PKEYS + bool