riscv: entry: set a0 = -ENOSYS only when syscall != -1
PATCH v4 1/1 riscv: entry: set a0 = -ENOSYS only when syscall != -1
When we test seccomp with 6.4 kernel, we found errno has wrong value. If we deny NETLINK_AUDIT with EAFNOSUPPORT, after f0bddf50586d, we will get ENOSYS instead. We got same result with commit 9c2598d43510 ("riscv: entry:
Save a0 prior syscall_enter_from_user_mode()").
After analysing code, we think that regs->a0 = -ENOSYS should only be executed when syscall != -1 In __seccomp_filter, when seccomp rejected this syscall with specified errno, they will set a0 to return number as syscall ABI, and then return -1. This return number is finally pass as return number of syscall_enter_from_user_mode, and then is compared with NR_syscalls after converted to ulong (so it will be ULONG_MAX). The condition syscall < NR_syscalls will always be false, so regs->a0 = -ENOSYS is always executed. It covered a0 set by seccomp, so we always get ENOSYS when match seccomp RET_ERRNO rule.
---
v3 -> v4: use long instead of ulong to reduce type cast and avoid
implementation-defined behavior, and make the judgment of syscall invalid more explicit
v2 -> v3: use if-statement instead of set default value,
clarify the type of syscall
v1 -> v2: added explanation on why always got ENOSYS
arch/riscv/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/riscv/kernel/traps.c +3 -3
@@ -297,7 +297,7 @@ asmlinkage __visible __trap_section void do_trap_break(struct pt_regs *regs) asmlinkage __visible __trap_section void do_trap_ecall_u(struct pt_regs *regs) {if (user_mode (regs)) { -ulong syscall = regs->a7; +long syscall = regs->a7; regs->epc +=4 ; regs->orig_a0 = regs->a0;
@@ -306,9 +306,9 @@ asmlinkage __visible __trap_section void do_trap_ecall_u(struct pt_regs *regs) syscall =syscall_enter_from_user_mode (regs, syscall); -if (syscall < NR_syscalls) +if (syscall >=0 && syscall < NR_syscalls)syscall_handler (regs, syscall); -else +else if (syscall !=-1 ) regs->a0 = -ENOSYS ;syscall_exit_to_user_mode (regs);
Signature · 1 line
2.41.0
Quoted 16 lines · Celeste Liu
When we test seccomp with 6.4 kernel, we found errno has wrong value. If we deny
NETLINK_AUDITwith EAFNOSUPPORT, afterf0bddf50586d, we will get ENOSYS instead. We got same result with commit9c2598d43510("riscv: entry:
Save a0 priorsyscall_enter_from_user_mode()").After analysing code, we think that
regs->a0=-ENOSYSshould only be executed when syscall != -1 In__seccomp_filter, when seccomp rejected this syscall with specified errno, they will set a0 to return number as syscall ABI, and then return -1. This return number is finally pass as return number ofsyscall_enter_from_user_mode, and then is compared withNR_syscallsafter converted to ulong (so it will beULONG_MAX). The condition syscall <NR_syscallswill always be false, soregs->a0=-ENOSYSis always executed. It covered a0 set by seccomp, so we always get ENOSYS when match seccompRET_ERRNOrule.
Quoted 8 lines
Fixes f0bddf50586d ("riscv: entry: Convert to generic entry")Reported-by Felix Yan <[email protected]>Co-developed-by Ruizhe Pan <[email protected]>Signed-off-by Ruizhe Pan <[email protected]>Co-developed-by Shiqi Zhang <[email protected]>Signed-off-by Shiqi Zhang <[email protected]>Signed-off-by Celeste Liu <[email protected]>Tested-by Felix Yan <[email protected]>
With this patch I can use groupmod, groupadd, usermod, useradd etc. inside systemd-nspawn again. Thanks!
Quoted 43 lines
Reviewed-by Björn Töpel <[email protected]>Reviewed-by Guo Ren <[email protected]>---
v3 -> v4: use long instead of ulong to reduce type cast and avoid
implementation-defined behavior, and make the judgment of syscall invalid more explicit
v2 -> v3: use if-statement instead of set default value,
clarify the type of syscall
v1 -> v2: added explanation on why always got ENOSYSarch/riscv/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/riscv/kernel/traps.c +3
-4@@ -297,7 +297,7 @@ asmlinkage __visible __trap_section void do_trap_break(struct pt_regs *regs) asmlinkage __visible __trap_section void do_trap_ecall_u(struct pt_regs *regs) {if (user_mode (regs)) { -ulong syscall = regs->a7; +long syscall = regs->a7; regs->epc +=4 ; regs->orig_a0 = regs->a0;@@ -306,9 +306,9 @@ asmlinkage __visible __trap_section void do_trap_ecall_u(struct pt_regs *regs) syscall =syscall_enter_from_user_mode (regs, syscall); -if (syscall < NR_syscalls) +if (syscall >=0 && syscall < NR_syscalls)syscall_handler (regs, syscall); -else +else if (syscall !=-1 ) regs->a0 = -ENOSYS ;syscall_exit_to_user_mode (regs); --2.41.0
Quoted 4 lines
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv