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

torvalds · torvalds · commit efee6c79298f · 2022-03-24T11:54:37.000-07:00
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
diff --git a/security/tomoyo/load_policy.c b/security/tomoyo/load_policy.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ static const char *tomoyo_loader;`
`24`	`24`	`static int __init tomoyo_loader_setup(char *str)`
`25`	`25`	`{`
`26`	`26`	`tomoyo_loader = str;`
`27`		`- return 0;`
	`27`	`+ return 1;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`__setup("TOMOYO_loader=", tomoyo_loader_setup);`
`@@ -64,7 +64,7 @@ static const char *tomoyo_trigger;`
`64`	`64`	`static int __init tomoyo_trigger_setup(char *str)`
`65`	`65`	`{`
`66`	`66`	`tomoyo_trigger = str;`
`67`		`- return 0;`
	`67`	`+ return 1;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`__setup("TOMOYO_trigger=", tomoyo_trigger_setup);`