riscv: cfi: reject unknown flags in PR_SET_CFI
PATCH 1/1 riscv: cfi: reject unknown flags in PR_SET_CFI
prctl(PR_SET_CFI,PR_CFI_BRANCH_LANDING_PADS) silently ignored unknown control values. Only PR_CFI_{ENABLE,DISABLE,LOCK} should be permitted.
This is a uABI breaking change (fails previously accepted bits with EINVAL).
--- arch/riscv/include/asm/usercfi.h | 1 + arch/riscv/kernel/usercfi.c | 3 +++ tools/testing/selftests/riscv/cfi/cfitests.c | 6 ++++++ 3 files changed, 10 insertions(+)
arch/riscv/include/asm/usercfi.h +1 -0
@@ -50,6 +50,7 @@ void set_indir_lp_status(struct task_struct *task, bool enable);void set_indir_lp_lock (struct task_struct *task,bool lock);#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) +#define PR_CFI_SUPPORTED_STATUS_MASK (PR_CFI_ENABLE | PR_CFI_DISABLE | PR_CFI_LOCK)#else
arch/riscv/kernel/usercfi.c +3 -0
@@ -467,6 +467,9 @@ int arch_prctl_set_branch_landing_pad_state(struct task_struct *t, unsigned longif (!is_user_lpad_enabled ())return -EINVAL ; +if (state & ~PR_CFI_SUPPORTED_STATUS_MASK ) +return -EINVAL ; +/* indirect branch tracking is locked and further can't be modified by user */ if (is_indir_lp_locked (t))return -EINVAL ;
tools/testing/selftests/riscv/cfi/cfitests.c +6 -0
@@ -141,6 +141,12 @@ int main(int argc, char *argv[])ksft_print_msg ("Starting risc-v tests\n" ); +/* Test unknown PR_CFI bits */ + ret =my_syscall5 (__NR_prctl,PR_SET_CFI ,PR_CFI_BRANCH_LANDING_PADS , +PR_CFI_ENABLE |0xffff0 ,0 ,0 ); +if (!ret) +ksft_exit_fail_msg ("PR_SET_CFI accepted reserved branch landing pad bits\n" ); +/* * Landing pad test. Not a lot of kernel changes to support landing * pads for user mode except lighting up a bit in senvcfg via a prctl.
Signature · 7 lines
2.47.3 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Paul Walmsley
maintainerHi,
Quoted 3 lines · Richard Patel
prctl(PR_SET_CFI,PR_CFI_BRANCH_LANDING_PADS)silently ignored unknown control values. Only PR_CFI_{ENABLE,DISABLE,LOCK} should be permitted.
<
Quoted 2 lines
This is a uABI breaking change (fails previously accepted bits with EINVAL).
Thanks for the patch. However, I'm not convinced that this actually breaks anything. The behavior of the interface changes when unknown flags are specified, but I'm not aware of anything that relies on this specific behavior.
Does that match your understanding?
- Paul
Quoted 11 lines · Paul Walmsley
Hi,
Quoted 3 lines · Richard Patel
prctl(PR_SET_CFI,PR_CFI_BRANCH_LANDING_PADS)silently ignored unknown control values. Only PR_CFI_{ENABLE,DISABLE,LOCK} should be permitted.<
Quoted 2 lines
This is a uABI breaking change (fails previously accepted bits with EINVAL).
Quoted 6 lines
Thanks for the patch. However, I'm not convinced that this actually breaks anything. The behavior of the interface changes when unknown flags are specified, but I'm not aware of anything that relies on this specific behavior.
Does that match your understanding?
I agree, yes, happy to rephrase the commit message.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv