| From: Stephen Kitt <steve@sk2.org> |
| Subject: sysctl: make ngroups_max const |
| |
| ngroups_max is a read-only sysctl entry, reflecting NGROUPS_MAX. Make it |
| const, in the same way as cap_last_cap. |
| |
| Link: https://lkml.kernel.org/r/20211123202347.818157-6-mcgrof@kernel.org |
| Signed-off-by: Stephen Kitt <steve@sk2.org> |
| Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| Cc: Amir Goldstein <amir73il@gmail.com> |
| Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Cc: Benjamin LaHaise <bcrl@kvack.org> |
| Cc: "Eric W. Biederman" <ebiederm@xmission.com> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Iurii Zaikin <yzaikin@google.com> |
| Cc: Jan Kara <jack@suse.cz> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Paul Turner <pjt@google.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Petr Mladek <pmladek@suse.com> |
| Cc: Qing Wang <wangqing@vivo.com> |
| Cc: Sebastian Reichel <sre@kernel.org> |
| Cc: Sergey Senozhatsky <senozhatsky@chromium.org> |
| Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> |
| Cc: Xiaoming Ni <nixiaoming@huawei.com> |
| Cc: Antti Palosaari <crope@iki.fi> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Cc: Clemens Ladisch <clemens@ladisch.de> |
| Cc: David Airlie <airlied@linux.ie> |
| Cc: Jani Nikula <jani.nikula@linux.intel.com> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> |
| Cc: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Cc: Julia Lawall <julia.lawall@inria.fr> |
| Cc: Lukas Middendorf <kernel@tuxforce.de> |
| Cc: Mark Fasheh <mark@fasheh.com> |
| Cc: Phillip Potter <phil@philpotter.co.uk> |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Cc: Douglas Gilbert <dgilbert@interlog.com> |
| Cc: James E.J. Bottomley <jejb@linux.ibm.com> |
| Cc: Jani Nikula <jani.nikula@intel.com> |
| Cc: John Ogness <john.ogness@linutronix.de> |
| Cc: Martin K. Petersen <martin.petersen@oracle.com> |
| Cc: "Rafael J. Wysocki" <rafael@kernel.org> |
| Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Cc: Suren Baghdasaryan <surenb@google.com> |
| Cc: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| kernel/sysctl.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/kernel/sysctl.c~sysctl-make-ngroups_max-const |
| +++ a/kernel/sysctl.c |
| @@ -125,7 +125,7 @@ static unsigned long dirty_bytes_min = 2 |
| static int maxolduid = 65535; |
| static int minolduid; |
| |
| -static int ngroups_max = NGROUPS_MAX; |
| +static const int ngroups_max = NGROUPS_MAX; |
| static const int cap_last_cap = CAP_LAST_CAP; |
| |
| |
| @@ -2291,7 +2291,7 @@ static struct ctl_table kern_table[] = { |
| #endif |
| { |
| .procname = "ngroups_max", |
| - .data = &ngroups_max, |
| + .data = (void *)&ngroups_max, |
| .maxlen = sizeof (int), |
| .mode = 0444, |
| .proc_handler = proc_dointvec, |
| _ |