x86: Remove the arch_calc_vm_prot_bits() macro from the UAPI

The arch_calc_vm_prot_bits() macro uses VM_PKEY_BIT0 etc. which are not part of the UAPI, so the macro is completely useless for userspace. It is also hidden behind the CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS config switch which we shouldn't expose to userspace. Thus let's move this macro into a new internal header instead.

Thomas Huth committed 3 years ago

Commit 659df861 parent 65e71083 files · +15 −9Browse files

Unified · Split

3 files

arch/x86/include/asm/mman.h +15 −0
arch/x86/include/uapi/asm/mman.h +0 −8
scripts/headers_install.sh +0 −1

arch/x86/include/asm/mman.h+15−0

@@ -0,0 +1,15 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	#ifndef __ASM_MMAN_H__
	3	#define __ASM_MMAN_H__
	4
	5	#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
	6	#define arch_calc_vm_prot_bits(prot, key) ( \
	7	((key) & 0x1 ? VM_PKEY_BIT0 : 0) \| \
	8	((key) & 0x2 ? VM_PKEY_BIT1 : 0) \| \
	9	((key) & 0x4 ? VM_PKEY_BIT2 : 0) \| \
	10	((key) & 0x8 ? VM_PKEY_BIT3 : 0))
	11	#endif
	12
	13	#include <uapi/asm/mman.h>
	14
	15	#endif /* __ASM_MMAN_H__ */

arch/x86/include/uapi/asm/mman.h+0−8

@@ -5,14 +5,6 @@ · 4 unmodified lines
5	#define MAP_32BIT 0x40 /* only give out 32bit addresses */	5	#define MAP_32BIT 0x40 /* only give out 32bit addresses */
6	#define MAP_ABOVE4G 0x80 /* only map above 4GB */	6	#define MAP_ABOVE4G 0x80 /* only map above 4GB */
7		7
8	#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
9	#define arch_calc_vm_prot_bits(prot, key) ( \
10	((key) & 0x1 ? VM_PKEY_BIT0 : 0) \| \
11	((key) & 0x2 ? VM_PKEY_BIT1 : 0) \| \
12	((key) & 0x4 ? VM_PKEY_BIT2 : 0) \| \
13	((key) & 0x8 ? VM_PKEY_BIT3 : 0))
14	#endif
15
16	/* Flags for map_shadow_stack(2) */	8	/* Flags for map_shadow_stack(2) */
17	#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */	9	#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */
18		10

scripts/headers_install.sh+0−1

@@ -81,7 +81,6 @@ arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO · 80 unmodified lines
81	arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT	81	arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
82	arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION	82	arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION
83	arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64	83	arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64
84	arch/x86/include/uapi/asm/mman.h:CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
85	"	84	"
86		85
87	for c in $configs	86	for c in $configs