mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 22:19:30 +02:00
Merge tag 'sysctl-7.03-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl fix from Joel Granados:
"This fell through the cracks during the latest merge window. There are
no more CONFIG_PROC_SYSCTL uses after this fix:
- Replace CONFIG_PROC_SYSCTL with CONFIG_SYSCTL
CONFIG_SYSCTL is the config string that controls sysctl subsys"
* tag 'sysctl-7.03-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
syscall_user_dispatch: Use CONFIG_SYSCTL for sysctl guard
This commit is contained in:
@@ -1416,7 +1416,7 @@ Controls whether userspace may arm Syscall User Dispatch via
|
||||
== ===================================================================
|
||||
|
||||
Only present when the kernel is built with ``CONFIG_SYSCALL_USER_DISPATCH``
|
||||
and ``CONFIG_PROC_SYSCTL``.
|
||||
and ``CONFIG_SYSCTL``.
|
||||
|
||||
|
||||
sysctl_writes_strict
|
||||
|
||||
@@ -178,7 +178,7 @@ int syscall_user_dispatch_set_config(struct task_struct *task, unsigned long siz
|
||||
(char __user *)(uintptr_t)cfg.selector);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_SYSCTL
|
||||
#ifdef CONFIG_SYSCTL
|
||||
static const struct ctl_table syscall_user_dispatch_sysctls[] = {
|
||||
{
|
||||
.procname = "syscall_user_dispatch",
|
||||
@@ -195,4 +195,4 @@ static int __init syscall_user_dispatch_sysctl_init(void)
|
||||
return 0;
|
||||
}
|
||||
late_initcall(syscall_user_dispatch_sysctl_init);
|
||||
#endif /* CONFIG_PROC_SYSCTL */
|
||||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
Reference in New Issue
Block a user