mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
Rename the struct audit_context variable to audit_cxt to avoid confusion
|
|
fit struct aa_task_context.
|
|
|
|
Index: b/security/apparmor/main.c
|
|
===================================================================
|
|
--- a/security/apparmor/main.c
|
|
+++ b/security/apparmor/main.c
|
|
@@ -352,7 +352,7 @@ int aa_audit_syscallreject(struct aa_pro
|
|
int aa_audit(struct aa_profile *profile, const struct aa_audit *sa)
|
|
{
|
|
struct audit_buffer *ab = NULL;
|
|
- struct audit_context *cxt;
|
|
+ struct audit_context *audit_cxt;
|
|
|
|
const char *logcls;
|
|
unsigned int flags;
|
|
@@ -411,13 +411,13 @@ int aa_audit(struct aa_profile *profile,
|
|
* we are rejecting a syscall
|
|
*/
|
|
if (sa->type == AA_AUDITTYPE_SYSCALL) {
|
|
- cxt = current->audit_context;
|
|
+ audit_cxt = current->audit_context;
|
|
} else {
|
|
- cxt = (flags & AA_AUDITFLAG_AUDITSS_SYSCALL) ?
|
|
+ audit_cxt = (flags & AA_AUDITFLAG_AUDITSS_SYSCALL) ?
|
|
current->audit_context : NULL;
|
|
}
|
|
|
|
- ab = audit_log_start(cxt, gfp_mask, AUDIT_APPARMOR);
|
|
+ ab = audit_log_start(audit_cxt, gfp_mask, AUDIT_APPARMOR);
|
|
|
|
if (!ab) {
|
|
AA_ERROR("Unable to log event (%d) to audit subsys\n",
|