1 From: Kurt Garloff <garloff@suse.de>
2 Subject: suid-dumpable ended up in wrong sysctl dir
5 Diffing in sysctl.c is tricky, using more context is recommended.
6 suid_dumpable ended up in fs/ instead of kernel/ and the reason
7 is likely a patch with too little context.
9 NOTE: This has been in the wrong dir fs/ since it was introduced by
10 Alan Cox into mainline on 2005-06-23. However, SUSE shipped it
11 in the correct directory kernel/ in SLES9.
13 By now, it's just something that we are going to have to drag along for
14 a long time until SLES 11/12/13 time frame...
16 Signed-off-by: Kurt Garloff <garloff@suse.de>
19 kernel/sysctl.c | 8 ++++++++
20 kernel/sysctl_check.c | 1 +
21 2 files changed, 9 insertions(+)
25 @@ -723,6 +723,14 @@ static struct ctl_table kern_table[] = {
26 .proc_handler = &proc_dointvec,
30 + .ctl_name = KERN_SETUID_DUMPABLE,
31 + .procname = "suid_dumpable",
32 + .data = &suid_dumpable,
33 + .maxlen = sizeof(int),
35 + .proc_handler = &proc_dointvec,
37 #if defined(CONFIG_S390) && defined(CONFIG_SMP)
39 .ctl_name = KERN_SPIN_RETRY,
40 --- a/kernel/sysctl_check.c
41 +++ b/kernel/sysctl_check.c
42 @@ -104,6 +104,7 @@ static const struct trans_ctl_table tran
43 { KERN_MAX_LOCK_DEPTH, "max_lock_depth" },
44 { KERN_NMI_WATCHDOG, "nmi_watchdog" },
45 { KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" },
46 + { KERN_SETUID_DUMPABLE, "suid_dumpable" },