mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
77acbdc0f3
The masking for PAC bits wasn't handling 32-bit architectures correctly.
Replace the u64 cast with uintptr_t.
Link: https://lore.kernel.org/lkml/CAMuHMdVz-J-1ZQ08u0bsQihDkcRmEPrtX5B_oRJ+Ns5jrasnUw@mail.gmail.com
Fixes: 2e53b877dc
("lkdtm: Add CFI_BACKWARD to test ROP mitigations")
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220427001226.1224704-1-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
187 lines
4.8 KiB
C
187 lines
4.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* This is for all the tests relating directly to Control Flow Integrity.
|
|
*/
|
|
#include "lkdtm.h"
|
|
#include <asm/page.h>
|
|
|
|
static int called_count;
|
|
|
|
/* Function taking one argument, without a return value. */
|
|
static noinline void lkdtm_increment_void(int *counter)
|
|
{
|
|
(*counter)++;
|
|
}
|
|
|
|
/* Function taking one argument, returning int. */
|
|
static noinline int lkdtm_increment_int(int *counter)
|
|
{
|
|
(*counter)++;
|
|
|
|
return *counter;
|
|
}
|
|
/*
|
|
* This tries to call an indirect function with a mismatched prototype.
|
|
*/
|
|
static void lkdtm_CFI_FORWARD_PROTO(void)
|
|
{
|
|
/*
|
|
* Matches lkdtm_increment_void()'s prototype, but not
|
|
* lkdtm_increment_int()'s prototype.
|
|
*/
|
|
void (*func)(int *);
|
|
|
|
pr_info("Calling matched prototype ...\n");
|
|
func = lkdtm_increment_void;
|
|
func(&called_count);
|
|
|
|
pr_info("Calling mismatched prototype ...\n");
|
|
func = (void *)lkdtm_increment_int;
|
|
func(&called_count);
|
|
|
|
pr_err("FAIL: survived mismatched prototype function call!\n");
|
|
pr_expected_config(CONFIG_CFI_CLANG);
|
|
}
|
|
|
|
/*
|
|
* This can stay local to LKDTM, as there should not be a production reason
|
|
* to disable PAC && SCS.
|
|
*/
|
|
#ifdef CONFIG_ARM64_PTR_AUTH_KERNEL
|
|
# ifdef CONFIG_ARM64_BTI_KERNEL
|
|
# define __no_pac "branch-protection=bti"
|
|
# else
|
|
# define __no_pac "branch-protection=none"
|
|
# endif
|
|
# define __no_ret_protection __noscs __attribute__((__target__(__no_pac)))
|
|
#else
|
|
# define __no_ret_protection __noscs
|
|
#endif
|
|
|
|
#define no_pac_addr(addr) \
|
|
((__force __typeof__(addr))((uintptr_t)(addr) | PAGE_OFFSET))
|
|
|
|
/* The ultimate ROP gadget. */
|
|
static noinline __no_ret_protection
|
|
void set_return_addr_unchecked(unsigned long *expected, unsigned long *addr)
|
|
{
|
|
/* Use of volatile is to make sure final write isn't seen as a dead store. */
|
|
unsigned long * volatile *ret_addr = (unsigned long **)__builtin_frame_address(0) + 1;
|
|
|
|
/* Make sure we've found the right place on the stack before writing it. */
|
|
if (no_pac_addr(*ret_addr) == expected)
|
|
*ret_addr = (addr);
|
|
else
|
|
/* Check architecture, stack layout, or compiler behavior... */
|
|
pr_warn("Eek: return address mismatch! %px != %px\n",
|
|
*ret_addr, addr);
|
|
}
|
|
|
|
static noinline
|
|
void set_return_addr(unsigned long *expected, unsigned long *addr)
|
|
{
|
|
/* Use of volatile is to make sure final write isn't seen as a dead store. */
|
|
unsigned long * volatile *ret_addr = (unsigned long **)__builtin_frame_address(0) + 1;
|
|
|
|
/* Make sure we've found the right place on the stack before writing it. */
|
|
if (no_pac_addr(*ret_addr) == expected)
|
|
*ret_addr = (addr);
|
|
else
|
|
/* Check architecture, stack layout, or compiler behavior... */
|
|
pr_warn("Eek: return address mismatch! %px != %px\n",
|
|
*ret_addr, addr);
|
|
}
|
|
|
|
static volatile int force_check;
|
|
|
|
static void lkdtm_CFI_BACKWARD(void)
|
|
{
|
|
/* Use calculated gotos to keep labels addressable. */
|
|
void *labels[] = {0, &&normal, &&redirected, &&check_normal, &&check_redirected};
|
|
|
|
pr_info("Attempting unchecked stack return address redirection ...\n");
|
|
|
|
/* Always false */
|
|
if (force_check) {
|
|
/*
|
|
* Prepare to call with NULLs to avoid parameters being treated as
|
|
* constants in -02.
|
|
*/
|
|
set_return_addr_unchecked(NULL, NULL);
|
|
set_return_addr(NULL, NULL);
|
|
if (force_check)
|
|
goto *labels[1];
|
|
if (force_check)
|
|
goto *labels[2];
|
|
if (force_check)
|
|
goto *labels[3];
|
|
if (force_check)
|
|
goto *labels[4];
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Use fallthrough switch case to keep basic block ordering between
|
|
* set_return_addr*() and the label after it.
|
|
*/
|
|
switch (force_check) {
|
|
case 0:
|
|
set_return_addr_unchecked(&&normal, &&redirected);
|
|
fallthrough;
|
|
case 1:
|
|
normal:
|
|
/* Always true */
|
|
if (!force_check) {
|
|
pr_err("FAIL: stack return address manipulation failed!\n");
|
|
/* If we can't redirect "normally", we can't test mitigations. */
|
|
return;
|
|
}
|
|
break;
|
|
default:
|
|
redirected:
|
|
pr_info("ok: redirected stack return address.\n");
|
|
break;
|
|
}
|
|
|
|
pr_info("Attempting checked stack return address redirection ...\n");
|
|
|
|
switch (force_check) {
|
|
case 0:
|
|
set_return_addr(&&check_normal, &&check_redirected);
|
|
fallthrough;
|
|
case 1:
|
|
check_normal:
|
|
/* Always true */
|
|
if (!force_check) {
|
|
pr_info("ok: control flow unchanged.\n");
|
|
return;
|
|
}
|
|
|
|
check_redirected:
|
|
pr_err("FAIL: stack return address was redirected!\n");
|
|
break;
|
|
}
|
|
|
|
if (IS_ENABLED(CONFIG_ARM64_PTR_AUTH_KERNEL)) {
|
|
pr_expected_config(CONFIG_ARM64_PTR_AUTH_KERNEL);
|
|
return;
|
|
}
|
|
if (IS_ENABLED(CONFIG_SHADOW_CALL_STACK)) {
|
|
pr_expected_config(CONFIG_SHADOW_CALL_STACK);
|
|
return;
|
|
}
|
|
pr_warn("This is probably expected, since this %s was built *without* %s=y nor %s=y\n",
|
|
lkdtm_kernel_info,
|
|
"CONFIG_ARM64_PTR_AUTH_KERNEL", "CONFIG_SHADOW_CALL_STACK");
|
|
}
|
|
|
|
static struct crashtype crashtypes[] = {
|
|
CRASHTYPE(CFI_FORWARD_PROTO),
|
|
CRASHTYPE(CFI_BACKWARD),
|
|
};
|
|
|
|
struct crashtype_category cfi_crashtypes = {
|
|
.crashtypes = crashtypes,
|
|
.len = ARRAY_SIZE(crashtypes),
|
|
};
|