aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/auditsc.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-09-29 05:01:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:25 -0400
commiteb84a20e9e6b98dcb33023ad22241d79107a08a7 (patch)
tree4971aef730cc3a1917463afe1dbb381dea664e99 /kernel/auditsc.c
parent5f412b24240d92212e50ebbaff2dff20c9e6f3d0 (diff)
[PATCH] audit/accounting: tty locking
Add tty locking around the audit and accounting code. The whole current->signal-> locking is all deeply strange but it's for someone else to sort out. Add rather than replace the lock for acct.c Signed-off-by: Alan Cox <alan@redhat.com> Acked-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r--kernel/auditsc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index fb83c5cb8c32..105147631753 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -817,6 +817,8 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
817 audit_log_format(ab, " success=%s exit=%ld", 817 audit_log_format(ab, " success=%s exit=%ld",
818 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", 818 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
819 context->return_code); 819 context->return_code);
820
821 mutex_lock(&tty_mutex);
820 if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name) 822 if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name)
821 tty = tsk->signal->tty->name; 823 tty = tsk->signal->tty->name;
822 else 824 else
@@ -838,6 +840,9 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
838 context->gid, 840 context->gid,
839 context->euid, context->suid, context->fsuid, 841 context->euid, context->suid, context->fsuid,
840 context->egid, context->sgid, context->fsgid, tty); 842 context->egid, context->sgid, context->fsgid, tty);
843
844 mutex_unlock(&tty_mutex);
845
841 audit_log_task_info(ab, tsk); 846 audit_log_task_info(ab, tsk);
842 if (context->filterkey) { 847 if (context->filterkey) {
843 audit_log_format(ab, " key="); 848 audit_log_format(ab, " key=");