projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e53b87
)
lkdtm: cfi: Fix type width for masking PAC bits
author
Kees Cook
<keescook@chromium.org>
Wed, 27 Apr 2022 00:09:11 +0000
(17:09 -0700)
committer
Kees Cook
<keescook@chromium.org>
Wed, 27 Apr 2022 00:11:05 +0000
(17:11 -0700)
The masking for PAC bits wasn't handling 32-bit architectures correctly.
Replace the u64 cast with uintptr_t.
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link:
https://lore.kernel.org/lkml/CAMuHMdVz-J-1ZQ08u0bsQihDkcRmEPrtX5B_oRJ+Ns5jrasnUw@mail.gmail.com
Fixes:
2e53b877dc12
("lkdtm: Add CFI_BACKWARD to test ROP mitigations")
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
drivers/misc/lkdtm/cfi.c
patch
|
blob
|
history
diff --git
a/drivers/misc/lkdtm/cfi.c
b/drivers/misc/lkdtm/cfi.c
index
804965a
..
666a7f4
100644
(file)
--- a/
drivers/misc/lkdtm/cfi.c
+++ b/
drivers/misc/lkdtm/cfi.c
@@
-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