diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-29 15:18:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-29 15:18:47 -0700 |
commit | 89a82a9218fabd753979847f494565f1fa91d7a8 (patch) | |
tree | bcda6fbc52d31e0e842db54d0345ae0021e1379e /kernel/audit.c | |
parent | 32826ac41f2170df0d9a2e8df5a9b570c7858ccf (diff) | |
parent | 3f5be2da8565c1cce5655bb0948fcc957c6eb6c6 (diff) | |
download | linux-stable-89a82a9218fabd753979847f494565f1fa91d7a8.tar.gz linux-stable-89a82a9218fabd753979847f494565f1fa91d7a8.tar.bz2 linux-stable-89a82a9218fabd753979847f494565f1fa91d7a8.zip |
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
"Two small patches to fix audit problems in 4.7-rcX: the first fixes a
potential kref leak, the second removes some header file noise.
The first is an important bug fix that really should go in before 4.7
is released, the second is not critical, but falls into the very-nice-
to-have category so I'm including in the pull request.
Both patches are straightforward, self-contained, and pass our
testsuite without problem"
* 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit:
audit: move audit_get_tty to reduce scope and kabi changes
audit: move calcs after alloc and check when logging set loginuid
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 22bb4f24f071..8d528f9930da 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1883,6 +1883,23 @@ out_null: audit_log_format(ab, " exe=(null)"); } +struct tty_struct *audit_get_tty(struct task_struct *tsk) +{ + struct tty_struct *tty = NULL; + unsigned long flags; + + spin_lock_irqsave(&tsk->sighand->siglock, flags); + if (tsk->signal) + tty = tty_kref_get(tsk->signal->tty); + spin_unlock_irqrestore(&tsk->sighand->siglock, flags); + return tty; +} + +void audit_put_tty(struct tty_struct *tty) +{ + tty_kref_put(tty); +} + void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk) { const struct cred *cred; |