Commit 2a033876 authored by Kees Cook's avatar Kees Cook
Browse files

lkdtm: cfi: Fix type width for masking PAC bits 



The masking for PAC bits wasn't handling 32-bit architectures correctly.
Replace the u64 cast with uintptr_t.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/lkml/CAMuHMdVz-J-1ZQ08u0bsQihDkcRmEPrtX5B_oRJ+Ns5jrasnUw@mail.gmail.com


Fixes: 2e53b877 ("lkdtm: Add CFI_BACKWARD to test ROP mitigations")
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 2e53b877

drivers/misc/lkdtm/cfi.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void lkdtm_CFI_FORWARD_PROTO(void) 
#endif



#define no_pac_addr(addr)      \

	((__force __typeof__(addr))((__force u64)(addr) | PAGE_OFFSET))

	((__force __typeof__(addr))((uintptr_t)(addr) | PAGE_OFFSET))



/* The ultimate ROP gadget. */

static noinline __no_ret_protection