diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-05 17:54:08 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-05 17:54:08 +1000 |
| commit | ed0217a79ad886b88179c70c6ffac27876324cf1 (patch) | |
| tree | f4429a7b6b30eb96d5fc6cac204efabf37f80ca5 | |
| parent | d85fbd9bd26f564a33d91e4242902c6802766703 (diff) | |
| parent | 5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb (diff) | |
| download | linux-next-ed0217a79ad886b88179c70c6ffac27876324cf1.tar.gz | |
Merge remote-tracking branch 'audit/next'
Conflicts:
security/lsm_audit.c
| -rw-r--r-- | kernel/audit.c | 2 | ||||
| -rw-r--r-- | kernel/auditsc.c | 4 | ||||
| -rw-r--r-- | security/lsm_audit.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 1c13e4267de6e7..f9e6065346db1e 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1904,7 +1904,7 @@ EXPORT_SYMBOL(audit_log_task_info); /** * audit_log_link_denied - report a link restriction denial - * @operation: specific link opreation + * @operation: specific link operation * @link: the path that triggered the restriction */ void audit_log_link_denied(const char *operation, struct path *link) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 9fb9d1cb83ce2b..ee097948b0a8c2 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -599,9 +599,7 @@ static int audit_filter_rules(struct task_struct *tsk, result = match_tree_refs(ctx, rule->tree); break; case AUDIT_LOGINUID: - result = 0; - if (ctx) - result = audit_uid_comparator(tsk->loginuid, f->op, f->uid); + result = audit_uid_comparator(tsk->loginuid, f->op, f->uid); break; case AUDIT_LOGINUID_SET: result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val); diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 1d34277dc402b5..4ed98107ace31c 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -282,7 +282,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, pid_t pid = task_pid_nr(tsk); if (pid) { char comm[sizeof(tsk->comm)]; - audit_log_format(ab, " pid=%d comm=", pid); + audit_log_format(ab, " opid=%d ocomm=", pid); audit_log_untrustedstring(ab, memcpy(comm, tsk->comm, sizeof(comm))); } |