From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753077AbbIPRuD (ORCPT ); Wed, 16 Sep 2015 13:50:03 -0400 Received: from mga02.intel.com ([134.134.136.20]:28070 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753725AbbIPRtN (ORCPT ); Wed, 16 Sep 2015 13:49:13 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,540,1437462000"; d="scan'208";a="805856570" Subject: [PATCH 23/26] [HIJACKPROT] x86, pkeys: add x86 version of arch_validate_prot() To: dave@sr71.net Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org From: Dave Hansen Date: Wed, 16 Sep 2015 10:49:12 -0700 References: <20150916174903.E112E464@viggo.jf.intel.com> In-Reply-To: <20150916174903.E112E464@viggo.jf.intel.com> Message-Id: <20150916174912.F07EE9C1@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows more than just the traditional PROT_* flags to be passed in to mprotect(), etc... on x86. --- b/arch/x86/include/uapi/asm/mman.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff -puN arch/x86/include/uapi/asm/mman.h~pkeys-81-arch_validate_prot arch/x86/include/uapi/asm/mman.h --- a/arch/x86/include/uapi/asm/mman.h~pkeys-81-arch_validate_prot 2015-09-16 09:45:54.564432490 -0700 +++ b/arch/x86/include/uapi/asm/mman.h 2015-09-16 09:45:54.567432626 -0700 @@ -6,6 +6,8 @@ #define MAP_HUGE_2MB (21 << MAP_HUGE_SHIFT) #define MAP_HUGE_1GB (30 << MAP_HUGE_SHIFT) +#include + #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS /* * Take the 4 protection key bits out of the vma->vm_flags @@ -26,8 +28,20 @@ ((prot) & PROT_PKEY1 ? VM_PKEY_BIT1 : 0) | \ ((prot) & PROT_PKEY2 ? VM_PKEY_BIT2 : 0) | \ ((prot) & PROT_PKEY3 ? VM_PKEY_BIT3 : 0)) -#endif -#include +#ifndef arch_validate_prot +/* + * This is called from mprotect(). PROT_GROWSDOWN and PROT_GROWSUP have + * already been masked out. + * + * Returns true if the prot flags are valid + */ +#define arch_validate_prot(prot) (\ + (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | \ + PROT_PKEY0 | PROT_PKEY1 | PROT_PKEY2 | PROT_PKEY3)) == 0) \ + +#endif /* arch_validate_prot */ + +#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */ #endif /* _ASM_X86_MMAN_H */ _