Re: [PATCH 4/9] sysctl: move maxolduid as a sysctl specific const

[Mickaël Salaün]

On 30/12/2021 01:46, Andrew Morton wrote:
> On Mon, 20 Dec 2021 11:25:41 -0800 Luis Chamberlain <mcgrof@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxx>

Thanks!

> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Cc: Antti Palosaari <crope@xxxxxx>
> Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx>
> Cc: Iurii Zaikin <yzaikin@xxxxxxxxxx>
> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
> Cc: Jeff Layton <jlayton@xxxxxxxxxx>
> Cc: Kees Cook <keescook@xxxxxxxxxxxx>
> Cc: Luis Chamberlain <mcgrof@xxxxxxxxxx>
> Cc: Lukas Middendorf <kernel@xxxxxxxxxxx>
> Cc: Stephen Kitt <steve@xxxxxxx>
> Cc: Xiaoming Ni <nixiaoming@xxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> ---
>
>   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 };
> _