Re: [PATCH] KERN_SETUID_DUMPABLE in /proc/sys/fs/

[Arjan van de Ven <arjan@infradead.org>]

On Fri, 2006-03-10 at 23:51 -0800, Andrew Morton wrote:
> Arjan van de Ven <arjan@infradead.org> wrote:
> >
> > 
> > > 
> > > > but yeah by this time we should just bite the bullet and rename the
> > > > variable rather than move it about
> > > 
> > > That wouldn't help - we'll still break existing scripts.
> > 
> > why? (I mean the KERN_ to FS_ rename in the kernel, that's not exported
> > to userland anywhere)
> 
> oic.  What are you expecting here?  Reading skills?

lesson to self: only speak in diff -u form before morning coffee


the setuid-dumpable sysctl got misplaces due to a patch glitch. But it's
part of the ABI now for some time so we need to keep it. This patch at
least renames the variable inside the kernel to match the new place, and
puts a comment in place to indicate that it's a known glitch

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

diff -purN linux-2.6.16-rc5/include/linux/sysctl.h linux-2.6.16-rc5-setuid/include/linux/sysctl.h
--- linux-2.6.16-rc5/include/linux/sysctl.h	2006-02-27 09:13:31.000000000 +0100
+++ linux-2.6.16-rc5-setuid/include/linux/sysctl.h	2006-03-11 09:02:13.000000000 +0100
@@ -144,7 +144,6 @@ enum
 	KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
 	KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
 	KERN_RANDOMIZE=68, /* int: randomize virtual address space */
-	KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
 	KERN_SPIN_RETRY=70,	/* int: number of spinlock retries */
 	KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
 };
@@ -759,6 +758,9 @@ enum
 	FS_AIO_NR=18,	/* current system-wide number of aio requests */
 	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */
 	FS_INOTIFY=20,	/* inotify submenu */
+			/* Note: the following got misplaced but this mistake is 
+			   now part of the ABI */
+	FS_SETUID_DUMPABLE=21, /* int: behaviour of dumps for setuid core */
 };
 
 /* /proc/sys/fs/quota/ */
diff -purN linux-2.6.16-rc5/kernel/sysctl.c linux-2.6.16-rc5-setuid/kernel/sysctl.c
--- linux-2.6.16-rc5/kernel/sysctl.c	2006-02-27 09:13:31.000000000 +0100
+++ linux-2.6.16-rc5-setuid/kernel/sysctl.c	2006-03-11 09:01:19.000000000 +0100
@@ -1022,7 +1022,7 @@ static ctl_table fs_table[] = {
 #endif	
 #endif
 	{
-		.ctl_name	= KERN_SETUID_DUMPABLE,
+		.ctl_name	= FS_SETUID_DUMPABLE,
 		.procname	= "suid_dumpable",
 		.data		= &suid_dumpable,
 		.maxlen		= sizeof(int),