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

torvalds · torvalds · commit ecc64d2dc9ff · 2026-03-04T08:21:11.000-08:00
Pull sysctl fix from Joel Granados:

 - Fix error when reporting jiffies converted values back to user space

   Return the converted value instead of "Invalid argument" error

* tag 'sysctl-7.00-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
  time/jiffies: Fix sysctl file error on configurations where USER_HZ &lt; HZ
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
@@ -256,8 +256,6 @@ EXPORT_SYMBOL(proc_dointvec_jiffies);
 int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int dir,
 				 void *buffer, size_t *lenp, loff_t *ppos)
 {
-	if (SYSCTL_USER_TO_KERN(dir) && USER_HZ < HZ)
-		return -EINVAL;
 	return proc_dointvec_conv(table, dir, buffer, lenp, ppos,
 				  do_proc_int_conv_userhz_jiffies);
 }

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,6 @@ EXPORT_SYMBOL(proc_dointvec_jiffies);`
`256`	`256`	`int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int dir,`
`257`	`257`	`void buffer, size_t lenp, loff_t *ppos)`
`258`	`258`	`{`
`259`		`- if (SYSCTL_USER_TO_KERN(dir) && USER_HZ < HZ)`
`260`		`- return -EINVAL;`
`261`	`259`	`return proc_dointvec_conv(table, dir, buffer, lenp, ppos,`
`262`	`260`	`do_proc_int_conv_userhz_jiffies);`
`263`	`261`	`}`