Commit d174174c authored by Joel Granados's avatar Joel Granados
Browse files

sysctl: replace SYSCTL_INT_CONV_CUSTOM macro with functions 



Remove SYSCTL_INT_CONV_CUSTOM and replace it with proc_int_conv. This
converter function expects a negp argument as it can take on negative
values. Update all jiffies converters to use explicit function calls.
Remove SYSCTL_CONV_IDENTITY as it is no longer used.

Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent ef153851

include/linux/sysctl.h

+4 −42
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,47 +72,6 @@ extern const int sysctl_vals[]; 
#define SYSCTL_USER_TO_KERN(dir) (!!(dir))

#define SYSCTL_KERN_TO_USER(dir) (!dir)



#ifdef CONFIG_PROC_SYSCTL

/**

 * 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;							\

}



#else // CONFIG_PROC_SYSCTL



#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)	\

{									\

	return -ENOSYS;							\

}



#endif // CONFIG_PROC_SYSCTL



extern const unsigned long sysctl_long_vals[];



typedef int proc_handler(const struct ctl_table *ctl, int write, void *buffer,
@@ -134,6 +92,10 @@ 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,

kernel/sysctl.c

+43 −4
Original line number Diff line number Diff line
@@ -515,6 +515,33 @@ int proc_int_u2k_conv_uop(const ulong *u_ptr, int *k_ptr, const bool *negp, 
	return 0;

}



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))

{

	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;

}







static int sysctl_user_to_kern_int_conv(const bool *negp, const ulong *u_ptr,

					int *k_ptr)

{
@@ -526,10 +553,22 @@ static int sysctl_kern_to_user_int_conv(bool *negp, ulong *u_ptr, const int *k_p 
	return proc_int_k2u_conv_kop(u_ptr, k_ptr, negp, NULL);

}



static SYSCTL_INT_CONV_CUSTOM(, sysctl_user_to_kern_int_conv,

			      sysctl_kern_to_user_int_conv, false)

static SYSCTL_INT_CONV_CUSTOM(_minmax, sysctl_user_to_kern_int_conv,

			      sysctl_kern_to_user_int_conv, true)

static int do_proc_int_conv(bool *negp, unsigned long *u_ptr, int *k_ptr,

			    int dir, const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,

			     sysctl_user_to_kern_int_conv,

			     sysctl_kern_to_user_int_conv);



}



static int do_proc_int_conv_minmax(bool *negp, unsigned long *u_ptr, int *k_ptr,

				   int dir, const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, true,

			     sysctl_user_to_kern_int_conv,

			     sysctl_kern_to_user_int_conv);

}



static const char proc_wspace_sep[] = { ' ', '\t', '\n' };

kernel/time/jiffies.c

+29 −10
Original line number Diff line number Diff line
@@ -156,17 +156,36 @@ static int sysctl_k2u_int_conv_ms(bool *negp, ulong *u_ptr, const int *k_ptr) 
	return proc_int_k2u_conv_kop(u_ptr, k_ptr, negp, sysctl_jiffies_to_msecs);

}



static int do_proc_int_conv_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,

				    int dir, const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,

			     sysctl_u2k_int_conv_hz, sysctl_k2u_int_conv_hz);

}



static SYSCTL_INT_CONV_CUSTOM(_jiffies, sysctl_u2k_int_conv_hz,

			      sysctl_k2u_int_conv_hz, false)

static SYSCTL_INT_CONV_CUSTOM(_userhz_jiffies,

static int do_proc_int_conv_userhz_jiffies(bool *negp, ulong *u_ptr,

					   int *k_ptr, int dir,

					   const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,

			     sysctl_u2k_int_conv_userhz,

			      sysctl_k2u_int_conv_userhz, false)

static SYSCTL_INT_CONV_CUSTOM(_ms_jiffies, sysctl_u2k_int_conv_ms,

			      sysctl_k2u_int_conv_ms, false)

static SYSCTL_INT_CONV_CUSTOM(_ms_jiffies_minmax,

			      sysctl_u2k_int_conv_ms,

			      sysctl_k2u_int_conv_ms, true)

			     sysctl_k2u_int_conv_userhz);

}



static int do_proc_int_conv_ms_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,

				       int dir, const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,

			     sysctl_u2k_int_conv_ms, sysctl_k2u_int_conv_ms);

}



static int do_proc_int_conv_ms_jiffies_minmax(bool *negp, ulong *u_ptr,

					      int *k_ptr, int dir,

					      const struct ctl_table *tbl)

{

	return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,

			     sysctl_u2k_int_conv_ms, sysctl_k2u_int_conv_ms);

}



#else // CONFIG_PROC_SYSCTL

static int do_proc_int_conv_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,