diff options
author | James Morris <james.l.morris@oracle.com> | 2017-05-22 02:32:40 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-05-22 02:32:40 -0400 |
commit | d68c51e0b377838dd31b37707813bb62089f399c (patch) | |
tree | 4557d5ced33ea6da60bc84ee288af9924192f046 /security/security.c | |
parent | 99c55fb18fc48508ae5bba57146a556aacc4558c (diff) | |
parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) |
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) | |||
129 | * to avoid security registration races. This method may also be used | 129 | * to avoid security registration races. This method may also be used |
130 | * to check if your LSM is currently loaded during kernel initialization. | 130 | * to check if your LSM is currently loaded during kernel initialization. |
131 | * | 131 | * |
132 | * Return true if: | 132 | * Returns: |
133 | * -The passed LSM is the one chosen by user at boot time, | 133 | * |
134 | * -or the passed LSM is configured as the default and the user did not | 134 | * true if: |
135 | * choose an alternate LSM at boot time. | 135 | * |
136 | * - The passed LSM is the one chosen by user at boot time, | ||
137 | * - or the passed LSM is configured as the default and the user did not | ||
138 | * choose an alternate LSM at boot time. | ||
139 | * | ||
136 | * Otherwise, return false. | 140 | * Otherwise, return false. |
137 | */ | 141 | */ |
138 | int __init security_module_enable(const char *module) | 142 | int __init security_module_enable(const char *module) |