mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-11-01 09:13:37 +00:00 
			
		
		
		
	sysctl: fix suid_dumpable and lease-break-time sysctls
Arne de Bruijn points out that commit
76fdbb25f9 ("coredump masking: bound
suid_dumpable sysctl") mistakenly limits lease-break-time instead of
suid_dumpable.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Reported-by: Arne de Bruijn <kernelbt@arbruijn.dds.nl>
Cc: Kawai, Hidehiro <hidehiro.kawai.ez@hitachi.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
			
			
This commit is contained in:
		
							parent
							
								
									303d379c54
								
							
						
					
					
						commit
						8e654fba4a
					
				
					 1 changed files with 6 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -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)
 | 
			
		||||
	{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue