diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-19 11:50:48 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-19 11:50:48 +1000 |
| commit | 3be64540ff3b3eceae39d35d2f56a7260ea037f1 (patch) | |
| tree | a025d7464b15e16357205d93c0ebc822c724f485 /security | |
| parent | 1f318a243c30ad6953cf08f21b5900398b0d0a45 (diff) | |
| parent | 0b08c5e59441d08ab4b5e72afefd5cd98a4d83df (diff) | |
Merge remote-tracking branch 'audit/next'
Conflicts:
security/lsm_audit.c
Diffstat (limited to 'security')
| -rw-r--r-- | security/lsm_audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 1d34277dc402..4ed98107ace3 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))); } |