diff options
| author |   James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
| commit | d68c51e0b377838dd31b37707813bb62089f399c (patch) | |
| tree | 4557d5ced33ea6da60bc84ee288af9924192f046 /security/security.c | |
| parent | security: Grammar s/allocates/allocated/ (diff) | |
| parent | Linux 4.12-rc2 (diff) | |
| download | linux-dev-d68c51e0b377838dd31b37707813bb62089f399c.tar.xz linux-dev-d68c51e0b377838dd31b37707813bb62089f399c.zip | |
Sync to mainline for security submaintainers to work against
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/security/security.c b/security/security.c index 54b1e395978a..38316bb28b16 100644 --- a/security/security.c +++ b/security/security.c @@ -129,10 +129,14 @@ static int lsm_append(char *new, char **result) * to avoid security registration races. This method may also be used * to check if your LSM is currently loaded during kernel initialization. * - * Return true if: - * -The passed LSM is the one chosen by user at boot time, - * -or the passed LSM is configured as the default and the user did not - * choose an alternate LSM at boot time. + * Returns: + * + * true if: + * + * - The passed LSM is the one chosen by user at boot time, + * - or the passed LSM is configured as the default and the user did not + * choose an alternate LSM at boot time. + * * Otherwise, return false. */ int __init security_module_enable(const char *module) |