Pull syscall entry fixes from Borislav Petkov: - For syscall user dispatch, separate prctl operation from syscall redirection range specification before the API has been made official in 5.11. - Ensure tasks using the generic syscall code do trap after returning from a syscall when single-stepping is requested. * tag 'core_urgent_for_v5.11_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: entry: Use different define for selector variable in SUD entry: Ensure trap after single-step on system call return
Showing the changes to include/linux (2 of 10 files). Show all
Unified · Split
| @@ -46,6 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | SYSCALL_WORK_SYSCALL_TRACE | \ |
| 47 | 47 | SYSCALL_WORK_SYSCALL_AUDIT | \ |
| 48 | 48 | SYSCALL_WORK_SYSCALL_USER_DISPATCH | \ |
| 49 | + SYSCALL_WORK_SYSCALL_EXIT_TRAP | \ | |
| 49 | 50 | ARCH_SYSCALL_WORK_EXIT) |
| 50 | 51 | |
| 51 | 52 | /* |
| @@ -43,6 +43,7 @@ enum syscall_work_bit { · 42 unmodified lines | ||
| 43 | 43 | SYSCALL_WORK_BIT_SYSCALL_EMU, |
| 44 | 44 | SYSCALL_WORK_BIT_SYSCALL_AUDIT, |
| 45 | 45 | SYSCALL_WORK_BIT_SYSCALL_USER_DISPATCH, |
| 46 | + SYSCALL_WORK_BIT_SYSCALL_EXIT_TRAP, | |
| 46 | 47 | }; |
| 47 | 48 | |
| 48 | 49 | #define SYSCALL_WORK_SECCOMP BIT(SYSCALL_WORK_BIT_SECCOMP) |
| @@ -51,6 +52,7 @@ enum syscall_work_bit { · 2 unmodified lines | ||
| 51 | 52 | #define SYSCALL_WORK_SYSCALL_EMU BIT(SYSCALL_WORK_BIT_SYSCALL_EMU) |
| 52 | 53 | #define SYSCALL_WORK_SYSCALL_AUDIT BIT(SYSCALL_WORK_BIT_SYSCALL_AUDIT) |
| 53 | 54 | #define SYSCALL_WORK_SYSCALL_USER_DISPATCH BIT(SYSCALL_WORK_BIT_SYSCALL_USER_DISPATCH) |
| 55 | +#define SYSCALL_WORK_SYSCALL_EXIT_TRAP BIT(SYSCALL_WORK_BIT_SYSCALL_EXIT_TRAP) | |
| 54 | 56 | #endif |
| 55 | 57 | |
| 56 | 58 | #include <asm/thread_info.h> |