mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
57690554ab
Both __pkru_allows_write() and arch_set_user_pkey_access() shift
PKRU_WD_BIT (a signed constant) by up to 30 bits, hitting the
sign bit.
Use unsigned constants instead.
Clearly pkey 15 has not been used in combination with UBSAN yet.
Noticed by code inspection only. I can't actually provoke the
compiler into generating incorrect logic as far as this shift is
concerned.
[
dhansen: add stable@ tag, plus minor changelog massaging,
For anyone doing backports, these #defines were in
arch/x86/include/asm/pgtable.h before 784a46618f.
]
Fixes: 33a709b25a ("mm/gup, x86/mm/pkeys: Check VMAs and PTEs for protection keys")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20211216000856.4480-1-andrew.cooper3@citrix.com
62 lines
1.3 KiB
C
62 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_X86_PKRU_H
|
|
#define _ASM_X86_PKRU_H
|
|
|
|
#include <asm/cpufeature.h>
|
|
|
|
#define PKRU_AD_BIT 0x1u
|
|
#define PKRU_WD_BIT 0x2u
|
|
#define PKRU_BITS_PER_PKEY 2
|
|
|
|
#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
|
|
extern u32 init_pkru_value;
|
|
#define pkru_get_init_value() READ_ONCE(init_pkru_value)
|
|
#else
|
|
#define init_pkru_value 0
|
|
#define pkru_get_init_value() 0
|
|
#endif
|
|
|
|
static inline bool __pkru_allows_read(u32 pkru, u16 pkey)
|
|
{
|
|
int pkru_pkey_bits = pkey * PKRU_BITS_PER_PKEY;
|
|
return !(pkru & (PKRU_AD_BIT << pkru_pkey_bits));
|
|
}
|
|
|
|
static inline bool __pkru_allows_write(u32 pkru, u16 pkey)
|
|
{
|
|
int pkru_pkey_bits = pkey * PKRU_BITS_PER_PKEY;
|
|
/*
|
|
* Access-disable disables writes too so we need to check
|
|
* both bits here.
|
|
*/
|
|
return !(pkru & ((PKRU_AD_BIT|PKRU_WD_BIT) << pkru_pkey_bits));
|
|
}
|
|
|
|
static inline u32 read_pkru(void)
|
|
{
|
|
if (cpu_feature_enabled(X86_FEATURE_OSPKE))
|
|
return rdpkru();
|
|
return 0;
|
|
}
|
|
|
|
static inline void write_pkru(u32 pkru)
|
|
{
|
|
if (!cpu_feature_enabled(X86_FEATURE_OSPKE))
|
|
return;
|
|
/*
|
|
* WRPKRU is relatively expensive compared to RDPKRU.
|
|
* Avoid WRPKRU when it would not change the value.
|
|
*/
|
|
if (pkru != rdpkru())
|
|
wrpkru(pkru);
|
|
}
|
|
|
|
static inline void pkru_write_default(void)
|
|
{
|
|
if (!cpu_feature_enabled(X86_FEATURE_OSPKE))
|
|
return;
|
|
|
|
wrpkru(pkru_get_init_value());
|
|
}
|
|
|
|
#endif
|