sysctl: move maxolduid as a sysctl specific const

The maxolduid value is only shared for sysctl purposes for use on a max range. Just stuff this into our shared const array. [akpm@linux-foundation.org: fix sysctl_vals[], per Mickaël]

Luis Chamberlain committed 4 years ago

Commit 54771611 parent c8c0c233 files · +8 −9Browse files

Unified · Split

3 files

fs/proc/proc_sysctl.c +1 −1
include/linux/sysctl.h +3 −0
kernel/sysctl.c +4 −8

fs/proc/proc_sysctl.c+1−1

@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; · 25 unmodified lines
26	static const struct inode_operations proc_sys_dir_operations;	26	static const struct inode_operations proc_sys_dir_operations;
27		27
28	/* shared constants to be used in various sysctls */	28	/* shared constants to be used in various sysctls */
29	const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX };	29	const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 };
30	EXPORT_SYMBOL(sysctl_vals);	30	EXPORT_SYMBOL(sysctl_vals);
31		31
32	const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };	32	const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };

include/linux/sysctl.h+3−0

@@ -49,6 +49,9 @@ struct ctl_dir; · 48 unmodified lines
49	#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8])	49	#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8])
50	#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9])	50	#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9])
51		51
		52	/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
		53	#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10])
		54
52	extern const int sysctl_vals[];	55	extern const int sysctl_vals[];
53		56
54	#define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0])	57	#define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0])

kernel/sysctl.c+4−8

 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
 static const unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
-static const int maxolduid = 65535;
-/* minolduid is SYSCTL_ZERO */
 static const int ngroups_max = NGROUPS_MAX;
 static const int cap_last_cap = CAP_LAST_CAP;
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= (void *)&maxolduid,
+		.extra2		= SYSCTL_MAXOLDUID,
 	},
 	{
 		.procname	= "overflowgid",
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= (void *)&maxolduid,
+		.extra2		= SYSCTL_MAXOLDUID,
 	},
 #ifdef CONFIG_S390
 	{
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= (void *)&maxolduid,
+		.extra2		= SYSCTL_MAXOLDUID,
 	},
 	{
 		.procname	= "overflowgid",
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= (void *)&maxolduid,
+		.extra2		= SYSCTL_MAXOLDUID,
 	},
 #ifdef CONFIG_FILE_LOCKING
 	{