| Message ID | 20211129205548.605569-5-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sysctl: 4th set of kernel/sysctl cleanups | expand |
This patch introduces a bug in -next: On 29/11/2021 21:55, Luis Chamberlain wrote: > The maxolduid value is only shared for sysctl purposes for > use on a max range. Just stuff this into our shared const > array. > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > --- > fs/proc/proc_sysctl.c | 2 +- > include/linux/sysctl.h | 3 +++ > kernel/sysctl.c | 12 ++++-------- > 3 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > index 7dec3d5a9ed4..675b625fa898 100644 > --- a/fs/proc/proc_sysctl.c > +++ b/fs/proc/proc_sysctl.c > @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; > static const struct inode_operations proc_sys_dir_operations; > > /* shared constants to be used in various sysctls */ > -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; The new SYSCTL_MAXOLDUID uses the index 10 of sysctl_vals[] but the same commit replaces index 8 (SYSCTL_THREE_THOUSAND used by vm.watermark_scale_factor) instead of adding a new entry. It should be: +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 }; > EXPORT_SYMBOL(sysctl_vals); > > const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX }; > diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h > index 2de6d20d191b..bb921eb8a02d 100644 > --- a/include/linux/sysctl.h > +++ b/include/linux/sysctl.h > @@ -49,6 +49,9 @@ struct ctl_dir; > #define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8]) > #define SYSCTL_INT_MAX ((void *)&sysctl_vals[9]) > > +/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ > +#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10]) > + > extern const int sysctl_vals[]; > > #define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0]) > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index dbd267d0f014..05d9dd85e17f 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -109,10 +109,6 @@ static const int six_hundred_forty_kb = 640 * 1024; > /* 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; > > @@ -2126,7 +2122,7 @@ static struct ctl_table kern_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > - .extra2 = (void *)&maxolduid, > + .extra2 = SYSCTL_MAXOLDUID, > }, > { > .procname = "overflowgid", > @@ -2135,7 +2131,7 @@ static struct ctl_table kern_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > - .extra2 = (void *)&maxolduid, > + .extra2 = SYSCTL_MAXOLDUID, > }, > #ifdef CONFIG_S390 > { > @@ -2907,7 +2903,7 @@ static struct ctl_table fs_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > - .extra2 = (void *)&maxolduid, > + .extra2 = SYSCTL_MAXOLDUID, > }, > { > .procname = "overflowgid", > @@ -2916,7 +2912,7 @@ static struct ctl_table fs_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > - .extra2 = (void *)&maxolduid, > + .extra2 = SYSCTL_MAXOLDUID, > }, > #ifdef CONFIG_FILE_LOCKING > { >
On Fri, Dec 17, 2021 at 05:15:01PM +0100, Mickaël Salaün wrote: > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > > index 7dec3d5a9ed4..675b625fa898 100644 > > --- a/fs/proc/proc_sysctl.c > > +++ b/fs/proc/proc_sysctl.c > > @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; > > static const struct inode_operations proc_sys_dir_operations; > > /* shared constants to be used in various sysctls */ > > -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; > > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; > > The new SYSCTL_MAXOLDUID uses the index 10 of sysctl_vals[] but the same > commit replaces index 8 (SYSCTL_THREE_THOUSAND used by > vm.watermark_scale_factor) instead of adding a new entry. > > It should be: > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, > 65535 }; Can you send a proper patch which properly fixes this and identifies the commit name with a Fixes tag. Since thi sis on Andrew's tree no commit ID is required given that they are ephemeral. Luis
On Mon, 20 Dec 2021 11:25:41 -0800 Luis Chamberlain <mcgrof@kernel.org> wrote: > On Fri, Dec 17, 2021 at 05:15:01PM +0100, Mickaël Salaün wrote: > > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > > > index 7dec3d5a9ed4..675b625fa898 100644 > > > --- a/fs/proc/proc_sysctl.c > > > +++ b/fs/proc/proc_sysctl.c > > > @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; > > > static const struct inode_operations proc_sys_dir_operations; > > > /* shared constants to be used in various sysctls */ > > > -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; > > > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; > > > > The new SYSCTL_MAXOLDUID uses the index 10 of sysctl_vals[] but the same > > commit replaces index 8 (SYSCTL_THREE_THOUSAND used by > > vm.watermark_scale_factor) instead of adding a new entry. > > > > It should be: > > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, > > 65535 }; > > Can you send a proper patch which properly fixes this and identifies > the commit name with a Fixes tag. Since thi sis on Andrew's tree no > commit ID is required given that they are ephemeral. I did this: From: Andrew Morton <akpm@linux-foundation.org> Subject: sysctl-move-maxolduid-as-a-sysctl-specific-const-fix fix sysctl_vals[], per Mickaël. Cc: Mickaël Salaün <mic@digikonet> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Antti Palosaari <crope@iki.fi> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Iurii Zaikin <yzaikin@google.com> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Lukas Middendorf <kernel@tuxforce.de> Cc: Stephen Kitt <steve@sk2.org> Cc: Xiaoming Ni <nixiaoming@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- fs/proc/proc_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/proc/proc_sysctl.c~sysctl-move-maxolduid-as-a-sysctl-specific-const-fix +++ a/fs/proc/proc_sysctl.c @@ -26,7 +26,7 @@ static const struct file_operations proc static const struct inode_operations proc_sys_dir_operations; /* shared constants to be used in various sysctls */ -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 }; EXPORT_SYMBOL(sysctl_vals); const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
On 30/12/2021 01:46, Andrew Morton wrote: > On Mon, 20 Dec 2021 11:25:41 -0800 Luis Chamberlain <mcgrof@kernel.org> wrote: > >> On Fri, Dec 17, 2021 at 05:15:01PM +0100, Mickaël Salaün wrote: >>>> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c >>>> index 7dec3d5a9ed4..675b625fa898 100644 >>>> --- a/fs/proc/proc_sysctl.c >>>> +++ b/fs/proc/proc_sysctl.c >>>> @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; >>>> static const struct inode_operations proc_sys_dir_operations; >>>> /* shared constants to be used in various sysctls */ >>>> -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; >>>> +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; >>> >>> The new SYSCTL_MAXOLDUID uses the index 10 of sysctl_vals[] but the same >>> commit replaces index 8 (SYSCTL_THREE_THOUSAND used by >>> vm.watermark_scale_factor) instead of adding a new entry. >>> >>> It should be: >>> +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, >>> 65535 }; >> >> Can you send a proper patch which properly fixes this and identifies >> the commit name with a Fixes tag. Since thi sis on Andrew's tree no >> commit ID is required given that they are ephemeral. > > I did this: > > From: Andrew Morton <akpm@linux-foundation.org> > Subject: sysctl-move-maxolduid-as-a-sysctl-specific-const-fix > > fix sysctl_vals[], per Mickaël. > > Cc: Mickaël Salaün <mic@digikonet> Except a typo in my email Signed-off-by: Mickaël Salaün <mic@digikod.net> Thanks! > Cc: Al Viro <viro@zeniv.linux.org.uk> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Antti Palosaari <crope@iki.fi> > Cc: Eric Biederman <ebiederm@xmission.com> > Cc: Iurii Zaikin <yzaikin@google.com> > Cc: "J. Bruce Fields" <bfields@fieldses.org> > Cc: Jeff Layton <jlayton@kernel.org> > Cc: Kees Cook <keescook@chromium.org> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Cc: Lukas Middendorf <kernel@tuxforce.de> > Cc: Stephen Kitt <steve@sk2.org> > Cc: Xiaoming Ni <nixiaoming@huawei.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > fs/proc/proc_sysctl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/fs/proc/proc_sysctl.c~sysctl-move-maxolduid-as-a-sysctl-specific-const-fix > +++ a/fs/proc/proc_sysctl.c > @@ -26,7 +26,7 @@ static const struct file_operations proc > static const struct inode_operations proc_sys_dir_operations; > > /* shared constants to be used in various sysctls */ > -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; > +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 }; > EXPORT_SYMBOL(sysctl_vals); > > const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX }; > _ >
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 7dec3d5a9ed4..675b625fa898 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations; static const struct inode_operations proc_sys_dir_operations; /* shared constants to be used in various sysctls */ -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; +const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 65535, INT_MAX }; EXPORT_SYMBOL(sysctl_vals); const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX }; diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 2de6d20d191b..bb921eb8a02d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -49,6 +49,9 @@ struct ctl_dir; #define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8]) #define SYSCTL_INT_MAX ((void *)&sysctl_vals[9]) +/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ +#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10]) + extern const int sysctl_vals[]; #define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0]) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index dbd267d0f014..05d9dd85e17f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -109,10 +109,6 @@ static const int six_hundred_forty_kb = 640 * 1024; /* 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; @@ -2126,7 +2122,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid", @@ -2135,7 +2131,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, #ifdef CONFIG_S390 { @@ -2907,7 +2903,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid", @@ -2916,7 +2912,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, #ifdef CONFIG_FILE_LOCKING {
The maxolduid value is only shared for sysctl purposes for use on a max range. Just stuff this into our shared const array. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- fs/proc/proc_sysctl.c | 2 +- include/linux/sysctl.h | 3 +++ kernel/sysctl.c | 12 ++++-------- 3 files changed, 8 insertions(+), 9 deletions(-)