diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-24 11:54:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-24 11:54:37 -0700 |
| commit | efee6c79298fd823c569d501d041de85caa102a6 (patch) | |
| tree | 38ab927c0f75cf885e104d5cb53e872b0624c70f /security | |
| parent | 3ce62cf4dc3b01d1cbee1293049ca5d4c7d6d749 (diff) | |
| parent | 39844b7e3084baecef52d1498b5fa81afa2cefa9 (diff) | |
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
Diffstat (limited to 'security')
| -rw-r--r-- | security/tomoyo/load_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/load_policy.c b/security/tomoyo/load_policy.c index 3445ae6fd479..363b65be87ab 100644 --- 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); |