diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2019-01-31 11:52:11 -0500 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2019-01-31 23:00:15 -0500 |
commit | 90462a5bd30c6ed91c6758e59537d047d7878ff9 (patch) | |
tree | 19dac5d6a368d626695ee639c29a2ac18490043e /security/apparmor | |
parent | 57d4657716aca81ef4d7ec23e8123d26e3d28954 (diff) |
audit: remove unused actx param from audit_rule_match
The audit_rule_match() struct audit_context *actx parameter is not used
by any in-tree consumers (selinux, apparmour, integrity, smack).
The audit context is an internal audit structure that should only be
accessed by audit accessor functions.
It was part of commit 03d37d25e0f9 ("LSM/Audit: Introduce generic
Audit LSM hooks") but appears to have never been used.
Remove it.
Please see the github issue
https://github.com/linux-audit/audit-kernel/issues/107
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: fixed the referenced commit title]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r-- | security/apparmor/audit.c | 3 | ||||
-rw-r--r-- | security/apparmor/include/audit.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index eeaddfe0c0fb..5a8b9cded4f2 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c | |||
@@ -225,8 +225,7 @@ int aa_audit_rule_known(struct audit_krule *rule) | |||
225 | return 0; | 225 | return 0; |
226 | } | 226 | } |
227 | 227 | ||
228 | int aa_audit_rule_match(u32 sid, u32 field, u32 op, void *vrule, | 228 | int aa_audit_rule_match(u32 sid, u32 field, u32 op, void *vrule) |
229 | struct audit_context *actx) | ||
230 | { | 229 | { |
231 | struct aa_audit_rule *rule = vrule; | 230 | struct aa_audit_rule *rule = vrule; |
232 | struct aa_label *label; | 231 | struct aa_label *label; |
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index b8c8b1066b0a..ee559bc2acb8 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h | |||
@@ -192,7 +192,6 @@ static inline int complain_error(int error) | |||
192 | void aa_audit_rule_free(void *vrule); | 192 | void aa_audit_rule_free(void *vrule); |
193 | int aa_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule); | 193 | int aa_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule); |
194 | int aa_audit_rule_known(struct audit_krule *rule); | 194 | int aa_audit_rule_known(struct audit_krule *rule); |
195 | int aa_audit_rule_match(u32 sid, u32 field, u32 op, void *vrule, | 195 | int aa_audit_rule_match(u32 sid, u32 field, u32 op, void *vrule); |
196 | struct audit_context *actx); | ||
197 | 196 | ||
198 | #endif /* __AA_AUDIT_H */ | 197 | #endif /* __AA_AUDIT_H */ |