iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proc: sysctl: prevent aliased sysctls from getting passed to init

Browse Source 
commit 8001f49394e353f035306a45bcf504f06fca6355 upstream.

The code that checks for unknown boot options is unaware of the sysctl
alias facility, which maps bootparams to sysctl values.  If a user sets
an old value that has a valid alias, a message about an invalid
parameter will be printed during boot, and the parameter will get passed
to init.  Fix by checking for the existence of aliased parameters in the
unknown boot parameter code.  If an alias exists, don't return an error
or pass the value to init.

Signed-off-by: Krister Johansen <kjlx@templeofstupid.com>
Cc: stable@vger.kernel.org
Fixes: 0a477e1ae21b ("kernel/sysctl: support handling command line aliases")
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Krister Johansen <kjlx@templeofstupid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Krister Johansen 2023-10-27 14:46:40 -07:00 committed by Greg Kroah-Hartman
parent 3f3880fc01
commit f95e9f7afe
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/proc/proc_sysctl.c
View File

@ -1780,6 +1780,13 @@ static const char *sysctl_find_alias(char *param)
return NULL;
}
bool sysctl_is_alias(char *param)
{
const char *alias = sysctl_find_alias(param);
return alias != NULL;
}
/* Set sysctl value passed on kernel command line. */
static int process_sysctl_arg(char *param, char *val,
const char *unused, void *arg)

6
include/linux/sysctl.h
View File

@ -210,6 +210,7 @@ extern void __register_sysctl_init(const char *path, struct ctl_table *table,
const char *table_name);
#define register_sysctl_init(path, table) __register_sysctl_init(path, table, #table)
void do_sysctl_args(void);
bool sysctl_is_alias(char *param);
extern int pwrsw_enabled;
extern int unaligned_enabled;
@ -251,6 +252,11 @@ static inline void setup_sysctl_set(struct ctl_table_set *p,
static inline void do_sysctl_args(void)
{
}
static inline bool sysctl_is_alias(char *param)
{
return false;
}
#endif /* CONFIG_SYSCTL */
int sysctl_max_threads(struct ctl_table *table, int write, void *buffer,

4
init/main.c
View File

@ -540,6 +540,10 @@ static int __init unknown_bootoption(char *param, char *val,
{
size_t len = strlen(param);
/* Handle params aliased to sysctls */
if (sysctl_is_alias(param))
return 0;
repair_env_string(param, val);
/* Handle obsolete-style parameters */