Commit efee6c79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tomoyo-pr-20220322' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1 

Pull tomoyo update from Tetsuo Handa:
 "Avoid unnecessarily leaking kernel command line arguments"

* tag 'tomoyo-pr-20220322' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
  TOMOYO: fix __setup handlers return values
parents 3ce62cf4 39844b7e

security/tomoyo/load_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static const char *tomoyo_loader; 
static int __init tomoyo_loader_setup(char *str)

{

	tomoyo_loader = str;

	return 0;

	return 1;

}



__setup("TOMOYO_loader=", tomoyo_loader_setup);
@@ -64,7 +64,7 @@ static const char *tomoyo_trigger; 
static int __init tomoyo_trigger_setup(char *str)

{

	tomoyo_trigger = str;

	return 0;

	return 1;

}



__setup("TOMOYO_trigger=", tomoyo_trigger_setup);