History

Merge tag 'core_urgent_for_v5.11_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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

Linus Torvalds committed 5 years ago

Commit c6792d42 parents 6fed85d 36a6c8410 files · +33 −27Browse files

Showing the changes to include/uapi/linux (1 of 10 files). Show all

Unified · Split

include/uapi/linux/prctl.h+3−0
@@ -251,5 +251,8 @@ struct prctl_mm_map { · 250 unmodified lines
251#define PR_SET_SYSCALL_USER_DISPATCH 59251#define PR_SET_SYSCALL_USER_DISPATCH 59
252# define PR_SYS_DISPATCH_OFF 0252# define PR_SYS_DISPATCH_OFF 0
253# define PR_SYS_DISPATCH_ON 1253# define PR_SYS_DISPATCH_ON 1
254/* The control values for the user space selector when dispatch is enabled */
255# define SYSCALL_DISPATCH_FILTER_ALLOW 0
256# define SYSCALL_DISPATCH_FILTER_BLOCK 1
254 257
255#endif /* _LINUX_PRCTL_H */258#endif /* _LINUX_PRCTL_H */