[PATCH] Fix suid_dumpable and lease-break-time sysctls

[PATCH] Fix suid_dumpable and lease-break-time sysctls

[Matthew Wilcox]

Arne de Bruijn points out in Bugzilla 12953 that commit
76fdbb25f963de5dc1e308325f0578a2f92b1c2d mistakenly limits
lease-break-time instead of suid_dumpable.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index c5ef44f..7755ae7 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -95,12 +95,9 @@ static int sixty = 60;
 static int neg_one = -1;
 #endif
 
-#if defined(CONFIG_MMU) && defined(CONFIG_FILE_LOCKING)
-static int two = 2;
-#endif
-
 static int zero;
 static int one = 1;
+static int two = 2;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;
 
@@ -1373,10 +1370,7 @@ static struct ctl_table fs_table[] = {
 		.data		= &lease_break_time,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= &proc_dointvec_minmax,
-		.strategy	= &sysctl_intvec,
-		.extra1		= &zero,
-		.extra2		= &two,
+		.proc_handler	= &proc_dointvec,
 	},
 #endif
 #ifdef CONFIG_AIO
@@ -1417,7 +1411,10 @@ static struct ctl_table fs_table[] = {
 		.data		= &suid_dumpable,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= &proc_dointvec,
+		.proc_handler	= &proc_dointvec_minmax,
+		.strategy	= &sysctl_intvec,
+		.extra1		= &zero,
+		.extra2		= &two,
 	},
 #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
 	{

-- 
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: [PATCH] Fix suid_dumpable and lease-break-time sysctls

[Andrew Morton]

On Fri, 27 Mar 2009 07:31:39 -0600 Matthew Wilcox <matthew@wil.cx> wrote:

> Arne de Bruijn points out in Bugzilla 12953 that commit
> 76fdbb25f963de5dc1e308325f0578a2f92b1c2d mistakenly limits
> lease-break-time instead of suid_dumpable.
> 
> Signed-off-by: Matthew Wilcox <matthew@wil.cx>

It would be nice to include the

Reported-by: Arne de Bruijn <kernelbt@arbruijn.dds.nl>

And to cc the reporter, please.

Also, please include the bugzilla URL
(http://bugzilla.kernel.org/show_bug.cgi?id=12953) in the changelog. 
Sometimes people will go through the commit logs closing off bugzilla
reports for us, and this makes their task simpler.

Re: [PATCH] Fix suid_dumpable and lease-break-time sysctls

[Andrew Morton]

On Sat, 28 Mar 2009 12:22:54 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:

> > Arne de Bruijn points out in Bugzilla 12953 that commit
> > 76fdbb25f963de5dc1e308325f0578a2f92b1c2d mistakenly limits
> > lease-break-time instead of suid_dumpable.
> > 
> > Signed-off-by: Matthew Wilcox <matthew@wil.cx>
> 
> It would be nice to include the
> 
> Reported-by: Arne de Bruijn <kernelbt@arbruijn.dds.nl>
> 
> And to cc the reporter, please.
> 
> Also, please include the bugzilla URL
> (http://bugzilla.kernel.org/show_bug.cgi?id=12953) in the changelog. 
> Sometimes people will go through the commit logs closing off bugzilla
> reports for us, and this makes their task simpler.
> 

err, OK, minor reading comprehension problems there.  I need a nap.