49 lines
1.4 KiB
Plaintext
49 lines
1.4 KiB
Plaintext
From: Kurt Garloff <garloff@suse.de>
|
|
Subject: suid-dumpable ended up in wrong sysctl dir
|
|
Patch-mainline: never
|
|
|
|
Diffing in sysctl.c is tricky, using more context is recommended.
|
|
suid_dumpable ended up in fs/ instead of kernel/ and the reason
|
|
is likely a patch with too little context.
|
|
|
|
NOTE: This has been in the wrong dir fs/ since it was introduced by
|
|
Alan Cox into mainline on 2005-06-23. However, SUSE shipped it
|
|
in the correct directory kernel/ in SLES9.
|
|
|
|
By now, it's just something that we are going to have to drag along for
|
|
a long time until SLES 11/12/13 time frame...
|
|
|
|
Signed-off-by: Kurt Garloff <garloff@suse.de>
|
|
|
|
---
|
|
kernel/sysctl.c | 7 +++++++
|
|
kernel/sysctl_binary.c | 1 +
|
|
2 files changed, 8 insertions(+)
|
|
|
|
--- a/kernel/sysctl.c
|
|
+++ b/kernel/sysctl.c
|
|
@@ -760,6 +760,13 @@ static struct ctl_table kern_table[] = {
|
|
.proc_handler = proc_dointvec,
|
|
},
|
|
#endif
|
|
+ {
|
|
+ .procname = "suid_dumpable",
|
|
+ .data = &suid_dumpable,
|
|
+ .maxlen = sizeof(int),
|
|
+ .mode = 0644,
|
|
+ .proc_handler = proc_dointvec,
|
|
+ },
|
|
#if defined(CONFIG_S390) && defined(CONFIG_SMP)
|
|
{
|
|
.procname = "spin_retry",
|
|
--- a/kernel/sysctl_binary.c
|
|
+++ b/kernel/sysctl_binary.c
|
|
@@ -136,6 +136,7 @@ static const struct bin_table bin_kern_t
|
|
{ CTL_INT, KERN_MAX_LOCK_DEPTH, "max_lock_depth" },
|
|
{ CTL_INT, KERN_NMI_WATCHDOG, "nmi_watchdog" },
|
|
{ CTL_INT, KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" },
|
|
+ { CTL_INT, KERN_SETUID_DUMPABLE, "suid_dumpable" },
|
|
{}
|
|
};
|
|
|