Skip to content

Commit 39844b7

Browse files
rddunlapTetsuo Handa
authored andcommitted
TOMOYO: fix __setup handlers return values
__setup() handlers should return 1 if the parameter is handled. Returning 0 causes the entire string to be added to init's environment strings (limited to 32 strings), unnecessarily polluting it. Using the documented strings "TOMOYO_loader=string1" and "TOMOYO_trigger=string2" causes an Unknown parameter message: Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5 TOMOYO_loader=string1 \ TOMOYO_trigger=string2", will be passed to user space. and these strings are added to init's environment string space: Run /sbin/init as init process with arguments: /sbin/init with environment: HOME=/ TERM=linux BOOT_IMAGE=/boot/bzImage-517rc5 TOMOYO_loader=string1 TOMOYO_trigger=string2 With this change, these __setup handlers act as expected, and init's environment is not polluted with these strings. Fixes: 0e4ae0e ("TOMOYO: Make several options configurable.") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru> Link: https://lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: James Morris <jmorris@namei.org> Cc: Kentaro Takeda <takedakn@nttdata.co.jp> Cc: tomoyo-dev-en@lists.osdn.me Cc: "Serge E. Hallyn" <serge@hallyn.com> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
1 parent 5c1ee56 commit 39844b7

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

security/tomoyo/load_policy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static const char *tomoyo_loader;
2424
static int __init tomoyo_loader_setup(char *str)
2525
{
2626
tomoyo_loader = str;
27-
return 0;
27+
return 1;
2828
}
2929

3030
__setup("TOMOYO_loader=", tomoyo_loader_setup);
@@ -64,7 +64,7 @@ static const char *tomoyo_trigger;
6464
static int __init tomoyo_trigger_setup(char *str)
6565
{
6666
tomoyo_trigger = str;
67-
return 0;
67+
return 1;
6868
}
6969

7070
__setup("TOMOYO_trigger=", tomoyo_trigger_setup);

0 commit comments

Comments
 (0)