diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-27 13:53:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-27 13:53:16 -0700 |
| commit | 4a10a91756ef381bced7b88cfb9232f660b92d93 (patch) | |
| tree | 6b15cd0593332fbbc8d6e4f4b0bf2b91156880f5 /security | |
| parent | e22619a29fcdb513b7bc020e84225bb3b5914259 (diff) | |
| parent | 0b08c5e59441d08ab4b5e72afefd5cd98a4d83df (diff) | |
| download | linux-4a10a91756ef381bced7b88cfb9232f660b92d93.tar.gz linux-4a10a91756ef381bced7b88cfb9232f660b92d93.tar.bz2 linux-4a10a91756ef381bced7b88cfb9232f660b92d93.zip | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"Four small audit patches for v4.2, all bug fixes. Only 10 lines of
change this time so very unremarkable, the patch subject lines pretty
much tell the whole story"
* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
audit: Fix check of return value of strnlen_user()
audit: obsolete audit_context check is removed in audit_filter_rules()
audit: fix for typo in comment to function audit_log_link_denied()
lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type
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))); } |