Commit 23b0f90b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sysctl-7.00-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl 

Pull sysctl updates from Joel Granados:

 - Remove macros from proc handler converters

   Replace the proc converter macros with "regular" functions. Though it
   is more verbose than the macro version, it helps when debugging and
   better aligns with coding-style.rst.

 - General cleanup

   Remove superfluous ctl_table forward declarations. Const qualify the
   memory_allocation_profiling_sysctl and loadpin_sysctl_table arrays.
   Add missing kernel doc to proc_dointvec_conv.

 - Testing

   This series was run through sysctl selftests/kunit test suite in
   x86_64. And went into linux-next after rc4, giving it a good 3 weeks
   of testing

* tag 'sysctl-7.00-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
  sysctl: replace SYSCTL_INT_CONV_CUSTOM macro with functions
  sysctl: Replace unidirectional INT converter macros with functions
  sysctl: Add kernel doc to proc_douintvec_conv
  sysctl: Replace UINT converter macros with functions
  sysctl: Add CONFIG_PROC_SYSCTL guards for converter macros
  sysctl: clarify proc_douintvec_minmax doc
  sysctl: Return -ENOSYS from proc_douintvec_conv when CONFIG_PROC_SYSCTL=n
  sysctl: Remove unused ctl_table forward declarations
  loadpin: Implement custom proc_handler for enforce
  alloc_tag: move memory_allocation_profiling_sysctls into .rodata
  sysctl: Add missing kernel-doc for proc_dointvec_conv
parents 7ad54bbb d174174c

fs/pipe.c

+18 −4
Original line number Diff line number Diff line
@@ -1481,10 +1481,24 @@ static struct file_system_type pipe_fs_type = { 
};



#ifdef CONFIG_SYSCTL

static SYSCTL_USER_TO_KERN_UINT_CONV(_pipe_maxsz, round_pipe_size)

static SYSCTL_UINT_CONV_CUSTOM(_pipe_maxsz,

			       sysctl_user_to_kern_uint_conv_pipe_maxsz,

			       sysctl_kern_to_user_uint_conv, true)



static ulong round_pipe_size_ul(ulong size)

{

	return round_pipe_size(size);

}



static int u2k_pipe_maxsz(const ulong *u_ptr, uint *k_ptr)

{

	return proc_uint_u2k_conv_uop(u_ptr, k_ptr, round_pipe_size_ul);

}



static int do_proc_uint_conv_pipe_maxsz(ulong *u_ptr, uint *k_ptr,

					int dir, const struct ctl_table *table)

{

	return proc_uint_conv(u_ptr, k_ptr, dir, table, true,

			      u2k_pipe_maxsz,

			      proc_uint_k2u_conv);

}



static int proc_dopipe_max_size(const struct ctl_table *table, int write,

				void *buffer, size_t *lenp, loff_t *ppos)

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -3525,7 +3525,6 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, 
ssize_t simple_attr_write_signed(struct file *file, const char __user *buf,

				 size_t len, loff_t *ppos);



struct ctl_table;

int __init list_bdev_fs_names(char *buf, size_t size);



#define __FMODE_EXEC		((__force int) FMODE_EXEC)

include/linux/hugetlb.h

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <linux/userfaultfd_k.h>

#include <linux/nodemask.h>



struct ctl_table;

struct user_struct;

struct mmu_gather;

struct node;

include/linux/printk.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ extern void console_verbose(void); 
/* strlen("ratelimit") + 1 */

#define DEVKMSG_STR_MAX_SIZE 10

extern char devkmsg_log_str[DEVKMSG_STR_MAX_SIZE];

struct ctl_table;



extern int suppress_printk;

include/linux/sysctl.h

+17 −103
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ extern const int sysctl_vals[]; 
#define SYSCTL_LONG_ONE		((void *)&sysctl_long_vals[1])

#define SYSCTL_LONG_MAX		((void *)&sysctl_long_vals[2])



#define SYSCTL_CONV_IDENTITY(val) (val)

/**

 *

 * "dir" originates from read_iter (dir = 0) or write_iter (dir = 1)
@@ -73,107 +72,6 @@ extern const int sysctl_vals[]; 
#define SYSCTL_USER_TO_KERN(dir) (!!(dir))

#define SYSCTL_KERN_TO_USER(dir) (!dir)



#define SYSCTL_USER_TO_KERN_INT_CONV(name, u_ptr_op)		\

int sysctl_user_to_kern_int_conv##name(const bool *negp,	\

				       const unsigned long *u_ptr,\

				       int *k_ptr)		\

{								\

	unsigned long u = u_ptr_op(*u_ptr);			\

	if (*negp) {						\

		if (u > (unsigned long) INT_MAX + 1)		\

			return -EINVAL;				\

		WRITE_ONCE(*k_ptr, -u);				\

	} else {						\

		if (u > (unsigned long) INT_MAX)		\

			return -EINVAL;				\

		WRITE_ONCE(*k_ptr, u);				\

	}							\

	return 0;						\

}



#define SYSCTL_KERN_TO_USER_INT_CONV(name, k_ptr_op)		\

int sysctl_kern_to_user_int_conv##name(bool *negp,		\

				       unsigned long *u_ptr,	\

				       const int *k_ptr)	\

{								\

	int val = READ_ONCE(*k_ptr);				\

	if (val < 0) {						\

		*negp = true;					\

		*u_ptr = -k_ptr_op((unsigned long)val);		\

	} else {						\

		*negp = false;					\

		*u_ptr = k_ptr_op((unsigned long)val);		\

	}							\

	return 0;						\

}



/**

 * To range check on a converted value, use a temp k_ptr

 * When checking range, value should be within (tbl->extra1, tbl->extra2)

 */

#define SYSCTL_INT_CONV_CUSTOM(name, user_to_kern, kern_to_user,	\

			       k_ptr_range_check)			\

int do_proc_int_conv##name(bool *negp, unsigned long *u_ptr, int *k_ptr,\

			   int dir, const struct ctl_table *tbl)	\

{									\

	if (SYSCTL_KERN_TO_USER(dir))					\

		return kern_to_user(negp, u_ptr, k_ptr);		\

									\

	if (k_ptr_range_check) {					\

		int tmp_k, ret;						\

		if (!tbl)						\

			return -EINVAL;					\

		ret = user_to_kern(negp, u_ptr, &tmp_k);		\

		if (ret)						\

			return ret;					\

		if ((tbl->extra1 && *(int *)tbl->extra1 > tmp_k) ||	\

		    (tbl->extra2 && *(int *)tbl->extra2 < tmp_k))	\

			return -EINVAL;					\

		WRITE_ONCE(*k_ptr, tmp_k);				\

	} else								\

		return user_to_kern(negp, u_ptr, k_ptr);		\

	return 0;							\

}



#define SYSCTL_USER_TO_KERN_UINT_CONV(name, u_ptr_op)		\

int sysctl_user_to_kern_uint_conv##name(const unsigned long *u_ptr,\

					unsigned int *k_ptr)	\

{								\

	unsigned long u = u_ptr_op(*u_ptr);			\

	if (u > UINT_MAX)					\

		return -EINVAL;					\

	WRITE_ONCE(*k_ptr, u);					\

	return 0;						\

}



#define SYSCTL_UINT_CONV_CUSTOM(name, user_to_kern, kern_to_user,	\

				k_ptr_range_check)			\

int do_proc_uint_conv##name(unsigned long *u_ptr, unsigned int *k_ptr,	\

			   int dir, const struct ctl_table *tbl)	\

{									\

	if (SYSCTL_KERN_TO_USER(dir))					\

		return kern_to_user(u_ptr, k_ptr);			\

									\

	if (k_ptr_range_check) {					\

		unsigned int tmp_k;					\

		int ret;						\

		if (!tbl)						\

			return -EINVAL;					\

		ret = user_to_kern(u_ptr, &tmp_k);			\

		if (ret)						\

			return ret;					\

		if ((tbl->extra1 &&					\

		     *(unsigned int *)tbl->extra1 > tmp_k) ||		\

		    (tbl->extra2 &&					\

		     *(unsigned int *)tbl->extra2 < tmp_k))		\

			return -ERANGE;					\

		WRITE_ONCE(*k_ptr, tmp_k);				\

	} else								\

		return user_to_kern(u_ptr, k_ptr);			\

	return 0;							\

}





extern const unsigned long sysctl_long_vals[];



typedef int proc_handler(const struct ctl_table *ctl, int write, void *buffer,
@@ -182,6 +80,7 @@ typedef int proc_handler(const struct ctl_table *ctl, int write, void *buffer, 
int proc_dostring(const struct ctl_table *, int, void *, size_t *, loff_t *);

int proc_dobool(const struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);



int proc_dointvec(const struct ctl_table *, int, void *, size_t *, loff_t *);

int proc_dointvec_minmax(const struct ctl_table *table, int dir, void *buffer,

			 size_t *lenp, loff_t *ppos);
@@ -189,6 +88,15 @@ int proc_dointvec_conv(const struct ctl_table *table, int dir, void *buffer, 
		       size_t *lenp, loff_t *ppos,

		       int (*conv)(bool *negp, unsigned long *u_ptr, int *k_ptr,

				   int dir, const struct ctl_table *table));

int proc_int_k2u_conv_kop(ulong *u_ptr, const int *k_ptr, bool *negp,

			  ulong (*k_ptr_op)(const ulong));

int proc_int_u2k_conv_uop(const ulong *u_ptr, int *k_ptr, const bool *negp,

			  ulong (*u_ptr_op)(const ulong));

int proc_int_conv(bool *negp, ulong *u_ptr, int *k_ptr, int dir,

		  const struct ctl_table *tbl, bool k_ptr_range_check,

		  int (*user_to_kern)(const bool *negp, const ulong *u_ptr, int *k_ptr),

		  int (*kern_to_user)(bool *negp, ulong *u_ptr, const int *k_ptr));



int proc_douintvec(const struct ctl_table *, int, void *, size_t *, loff_t *);

int proc_douintvec_minmax(const struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);
@@ -196,6 +104,13 @@ int proc_douintvec_conv(const struct ctl_table *table, int write, void *buffer, 
			size_t *lenp, loff_t *ppos,

			int (*conv)(unsigned long *lvalp, unsigned int *valp,

				    int write, const struct ctl_table *table));

int proc_uint_k2u_conv(ulong *u_ptr, const uint *k_ptr);

int proc_uint_u2k_conv_uop(const ulong *u_ptr, uint *k_ptr,

			   ulong (*u_ptr_op)(const ulong));

int proc_uint_conv(ulong *u_ptr, uint *k_ptr, int dir,

		   const struct ctl_table *tbl, bool k_ptr_range_check,

		   int (*user_to_kern)(const ulong *u_ptr, uint *k_ptr),

		   int (*kern_to_user)(ulong *u_ptr, const uint *k_ptr));



int proc_dou8vec_minmax(const struct ctl_table *table, int write, void *buffer,

			size_t *lenp, loff_t *ppos);
@@ -206,7 +121,6 @@ int proc_doulongvec_minmax_conv(const struct ctl_table *table, int dir, 
int proc_do_large_bitmap(const struct ctl_table *, int, void *, size_t *, loff_t *);

int proc_do_static_key(const struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);

int sysctl_kern_to_user_uint_conv(unsigned long *u_ptr, const unsigned int *k_ptr);



/*

 * Register a set of sysctl names by calling register_sysctl