Skip to content

Commit d174174

Browse files
JoelgranadosJoelgranados
committed
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: Joel Granados <joel.granados@kernel.org>
1 parent ef15385 commit d174174

3 files changed

Lines changed: 76 additions & 56 deletions

File tree

‎include/linux/sysctl.h‎

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ extern const int sysctl_vals[];
5959
#define SYSCTL_LONG_ONE ((void *)&sysctl_long_vals[1])
6060
#define SYSCTL_LONG_MAX ((void *)&sysctl_long_vals[2])
6161

62-
#define SYSCTL_CONV_IDENTITY(val) (val)
6362
/**
6463
*
6564
* "dir" originates from read_iter (dir = 0) or write_iter (dir = 1)
@@ -73,47 +72,6 @@ extern const int sysctl_vals[];
7372
#define SYSCTL_USER_TO_KERN(dir) (!!(dir))
7473
#define SYSCTL_KERN_TO_USER(dir) (!dir)
7574

76-
#ifdef CONFIG_PROC_SYSCTL
77-
/**
78-
* To range check on a converted value, use a temp k_ptr
79-
* When checking range, value should be within (tbl->extra1, tbl->extra2)
80-
*/
81-
#define SYSCTL_INT_CONV_CUSTOM(name, user_to_kern, kern_to_user, \
82-
k_ptr_range_check) \
83-
int do_proc_int_conv##name(bool *negp, unsigned long *u_ptr, int *k_ptr,\
84-
int dir, const struct ctl_table *tbl) \
85-
{ \
86-
if (SYSCTL_KERN_TO_USER(dir)) \
87-
return kern_to_user(negp, u_ptr, k_ptr); \
88-
\
89-
if (k_ptr_range_check) { \
90-
int tmp_k, ret; \
91-
if (!tbl) \
92-
return -EINVAL; \
93-
ret = user_to_kern(negp, u_ptr, &tmp_k); \
94-
if (ret) \
95-
return ret; \
96-
if ((tbl->extra1 && *(int *)tbl->extra1 > tmp_k) || \
97-
(tbl->extra2 && *(int *)tbl->extra2 < tmp_k)) \
98-
return -EINVAL; \
99-
WRITE_ONCE(*k_ptr, tmp_k); \
100-
} else \
101-
return user_to_kern(negp, u_ptr, k_ptr); \
102-
return 0; \
103-
}
104-
105-
#else // CONFIG_PROC_SYSCTL
106-
107-
#define SYSCTL_INT_CONV_CUSTOM(name, user_to_kern, kern_to_user, \
108-
k_ptr_range_check) \
109-
int do_proc_int_conv##name(bool *negp, unsigned long *u_ptr, int *k_ptr,\
110-
int dir, const struct ctl_table *tbl) \
111-
{ \
112-
return -ENOSYS; \
113-
}
114-
115-
#endif // CONFIG_PROC_SYSCTL
116-
11775
extern const unsigned long sysctl_long_vals[];
11876

11977
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,
13492
ulong (*k_ptr_op)(const ulong));
13593
int proc_int_u2k_conv_uop(const ulong *u_ptr, int *k_ptr, const bool *negp,
13694
ulong (*u_ptr_op)(const ulong));
95+
int proc_int_conv(bool *negp, ulong *u_ptr, int *k_ptr, int dir,
96+
const struct ctl_table *tbl, bool k_ptr_range_check,
97+
int (*user_to_kern)(const bool *negp, const ulong *u_ptr, int *k_ptr),
98+
int (*kern_to_user)(bool *negp, ulong *u_ptr, const int *k_ptr));
13799

138100
int proc_douintvec(const struct ctl_table *, int, void *, size_t *, loff_t *);
139101
int proc_douintvec_minmax(const struct ctl_table *table, int write, void *buffer,

‎kernel/sysctl.c‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,33 @@ int proc_int_u2k_conv_uop(const ulong *u_ptr, int *k_ptr, const bool *negp,
515515
return 0;
516516
}
517517

518+
int proc_int_conv(bool *negp, ulong *u_ptr, int *k_ptr, int dir,
519+
const struct ctl_table *tbl, bool k_ptr_range_check,
520+
int (*user_to_kern)(const bool *negp, const ulong *u_ptr, int *k_ptr),
521+
int (*kern_to_user)(bool *negp, ulong *u_ptr, const int *k_ptr))
522+
{
523+
if (SYSCTL_KERN_TO_USER(dir))
524+
return kern_to_user(negp, u_ptr, k_ptr);
525+
526+
if (k_ptr_range_check) {
527+
int tmp_k, ret;
528+
529+
if (!tbl)
530+
return -EINVAL;
531+
ret = user_to_kern(negp, u_ptr, &tmp_k);
532+
if (ret)
533+
return ret;
534+
if ((tbl->extra1 && *(int *)tbl->extra1 > tmp_k) ||
535+
(tbl->extra2 && *(int *)tbl->extra2 < tmp_k))
536+
return -EINVAL;
537+
WRITE_ONCE(*k_ptr, tmp_k);
538+
} else
539+
return user_to_kern(negp, u_ptr, k_ptr);
540+
return 0;
541+
}
542+
543+
544+
518545
static int sysctl_user_to_kern_int_conv(const bool *negp, const ulong *u_ptr,
519546
int *k_ptr)
520547
{
@@ -526,10 +553,22 @@ static int sysctl_kern_to_user_int_conv(bool *negp, ulong *u_ptr, const int *k_p
526553
return proc_int_k2u_conv_kop(u_ptr, k_ptr, negp, NULL);
527554
}
528555

529-
static SYSCTL_INT_CONV_CUSTOM(, sysctl_user_to_kern_int_conv,
530-
sysctl_kern_to_user_int_conv, false)
531-
static SYSCTL_INT_CONV_CUSTOM(_minmax, sysctl_user_to_kern_int_conv,
532-
sysctl_kern_to_user_int_conv, true)
556+
static int do_proc_int_conv(bool *negp, unsigned long *u_ptr, int *k_ptr,
557+
int dir, const struct ctl_table *tbl)
558+
{
559+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,
560+
sysctl_user_to_kern_int_conv,
561+
sysctl_kern_to_user_int_conv);
562+
563+
}
564+
565+
static int do_proc_int_conv_minmax(bool *negp, unsigned long *u_ptr, int *k_ptr,
566+
int dir, const struct ctl_table *tbl)
567+
{
568+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, true,
569+
sysctl_user_to_kern_int_conv,
570+
sysctl_kern_to_user_int_conv);
571+
}
533572

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

‎kernel/time/jiffies.c‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,36 @@ static int sysctl_k2u_int_conv_ms(bool *negp, ulong *u_ptr, const int *k_ptr)
156156
return proc_int_k2u_conv_kop(u_ptr, k_ptr, negp, sysctl_jiffies_to_msecs);
157157
}
158158

159+
static int do_proc_int_conv_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,
160+
int dir, const struct ctl_table *tbl)
161+
{
162+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,
163+
sysctl_u2k_int_conv_hz, sysctl_k2u_int_conv_hz);
164+
}
165+
166+
static int do_proc_int_conv_userhz_jiffies(bool *negp, ulong *u_ptr,
167+
int *k_ptr, int dir,
168+
const struct ctl_table *tbl)
169+
{
170+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,
171+
sysctl_u2k_int_conv_userhz,
172+
sysctl_k2u_int_conv_userhz);
173+
}
159174

160-
static SYSCTL_INT_CONV_CUSTOM(_jiffies, sysctl_u2k_int_conv_hz,
161-
sysctl_k2u_int_conv_hz, false)
162-
static SYSCTL_INT_CONV_CUSTOM(_userhz_jiffies,
163-
sysctl_u2k_int_conv_userhz,
164-
sysctl_k2u_int_conv_userhz, false)
165-
static SYSCTL_INT_CONV_CUSTOM(_ms_jiffies, sysctl_u2k_int_conv_ms,
166-
sysctl_k2u_int_conv_ms, false)
167-
static SYSCTL_INT_CONV_CUSTOM(_ms_jiffies_minmax,
168-
sysctl_u2k_int_conv_ms,
169-
sysctl_k2u_int_conv_ms, true)
175+
static int do_proc_int_conv_ms_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,
176+
int dir, const struct ctl_table *tbl)
177+
{
178+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,
179+
sysctl_u2k_int_conv_ms, sysctl_k2u_int_conv_ms);
180+
}
181+
182+
static int do_proc_int_conv_ms_jiffies_minmax(bool *negp, ulong *u_ptr,
183+
int *k_ptr, int dir,
184+
const struct ctl_table *tbl)
185+
{
186+
return proc_int_conv(negp, u_ptr, k_ptr, dir, tbl, false,
187+
sysctl_u2k_int_conv_ms, sysctl_k2u_int_conv_ms);
188+
}
170189

171190
#else // CONFIG_PROC_SYSCTL
172191
static int do_proc_int_conv_jiffies(bool *negp, ulong *u_ptr, int *k_ptr,

0 commit comments

Comments
 (0)