diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-19 18:59:38 -0400 |
---|---|---|
committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-19 18:59:38 -0400 |
commit | d410fa4ef99112386de5f218dd7df7b4fca910b4 (patch) | |
tree | e29fbc3f6d27b20d73d8feb4ed73f6767f2e18fe /security/apparmor | |
parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) |
Create Documentation/security/,
move LSM-, credentials-, and keys-related files from Documentation/
to Documentation/security/,
add Documentation/security/00-INDEX, and
update all occurrences of Documentation/<moved_file>
to Documentation/security/<moved_file>.
Diffstat (limited to 'security/apparmor')
-rw-r--r-- | security/apparmor/match.c | 2 | ||||
-rw-r--r-- | security/apparmor/policy_unpack.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/match.c b/security/apparmor/match.c index 06d764ccbbe5..94de6b4907c8 100644 --- a/security/apparmor/match.c +++ b/security/apparmor/match.c | |||
@@ -194,7 +194,7 @@ void aa_dfa_free_kref(struct kref *kref) | |||
194 | * @flags: flags controlling what type of accept tables are acceptable | 194 | * @flags: flags controlling what type of accept tables are acceptable |
195 | * | 195 | * |
196 | * Unpack a dfa that has been serialized. To find information on the dfa | 196 | * Unpack a dfa that has been serialized. To find information on the dfa |
197 | * format look in Documentation/apparmor.txt | 197 | * format look in Documentation/security/apparmor.txt |
198 | * Assumes the dfa @blob stream has been aligned on a 8 byte boundary | 198 | * Assumes the dfa @blob stream has been aligned on a 8 byte boundary |
199 | * | 199 | * |
200 | * Returns: an unpacked dfa ready for matching or ERR_PTR on failure | 200 | * Returns: an unpacked dfa ready for matching or ERR_PTR on failure |
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index e33aaf7e5744..d6d9a57b5652 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c | |||
@@ -12,8 +12,8 @@ | |||
12 | * published by the Free Software Foundation, version 2 of the | 12 | * published by the Free Software Foundation, version 2 of the |
13 | * License. | 13 | * License. |
14 | * | 14 | * |
15 | * AppArmor uses a serialized binary format for loading policy. | 15 | * AppArmor uses a serialized binary format for loading policy. To find |
16 | * To find policy format documentation look in Documentation/apparmor.txt | 16 | * policy format documentation look in Documentation/security/apparmor.txt |
17 | * All policy is validated before it is used. | 17 | * All policy is validated before it is used. |
18 | */ | 18 | */ |
19 | 19 | ||