diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 15:48:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 09:49:59 -0700 |
| commit | b61c37f57988567c84359645f8202a7c84bc798a (patch) | |
| tree | a808c891711d060060a751f4119198dc06e2c847 /security/apparmor/audit.c | |
| parent | 3f0882c48286e7bdb0bbdec9c4bfa934e0db8e09 (diff) | |
| download | linux-b61c37f57988567c84359645f8202a7c84bc798a.tar.gz linux-b61c37f57988567c84359645f8202a7c84bc798a.tar.bz2 linux-b61c37f57988567c84359645f8202a7c84bc798a.zip | |
lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'
It just bloats the audit data structure for no good reason, since the
only time those fields are filled are just before calling the
common_lsm_audit() function, which is also the only user of those
fields.
So just make them be the arguments to common_lsm_audit(), rather than
bloating that structure that is passed around everywhere, and is
initialized in hot paths.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/apparmor/audit.c')
| -rw-r--r-- | security/apparmor/audit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index 23f7eb658d9c..cc3520d39a78 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c @@ -160,9 +160,7 @@ void aa_audit_msg(int type, struct common_audit_data *sa, void (*cb) (struct audit_buffer *, void *)) { sa->aad->type = type; - sa->lsm_pre_audit = audit_pre; - sa->lsm_post_audit = cb; - common_lsm_audit(sa); + common_lsm_audit(sa, audit_pre, cb); } /** |