audit/accounting: tty locking
PATCH 1/1 audit/accounting: tty locking
Fairly basic stuff .. make sure the name we are encoding doesn't vanish under us.
kernel/acct.c +2 -2
@@ -483,10 +483,10 @@ ac.ac_ppid = current->parent->tgid;#endif -read_lock (&tasklist_lock);/* pin current->signal */ +mutex_lock (&tty_mutex); ac.ac_tty = current->signal->tty ?old_encode_dev (tty_devnum (current->signal->tty)) :0 ; -read_unlock (&tasklist_lock); +mutex_unlock (&tty_mutex);spin_lock_irq (¤t->sighand->siglock); ac.ac_utime =encode_comp_t (jiffies_to_AHZ (cputime_to_jiffies (pacct->ac_utime)));
kernel/auditsc.c +5 -0
@@ -766,6 +766,8 @@audit_log_format (ab," success=%s exit=%ld" , (context->return_valid==AUDITSC_SUCCESS )?"yes" :"no" , context->return_code); + +mutex_lock (&tty_mutex);if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name) tty = tsk->signal->tty->name;else
@@ -787,6 +789,9 @@ context->gid, context->euid, context->suid, context->fsuid, context->egid, context->sgid, context->fsgid, tty); + +mutex_unlock (&tty_mutex); +audit_log_task_info (ab, tsk);if (context->filterkey) {audit_log_format (ab," key=" );
Ar Llu, 2006-09-04 am 15:36 +0100, ysgrifennodd Alan Cox:
Quoted 2 lines
Fairly basic stuff .. make sure the name we are encoding doesn't vanish under us.
Here's a replacement that is more paranoid about the locking as suggested by Arjan. The whole current->signal-> locking is all deeply strange but its for someone else to sort out. Add rather than replace the lock for acct.c
kernel/acct.c +5 -1
@@ -483,10 +483,14 @@ ac.ac_ppid = current->parent->tgid;#endif -read_lock (&tasklist_lock);/* pin current->signal */ +mutex_lock (&tty_mutex); +/* FIXME: Whoever is responsible for current->signal locking needs +to use the same locking all over the kernel and document it */ +read_lock (&tasklist_lock); ac.ac_tty = current->signal->tty ?old_encode_dev (tty_devnum (current->signal->tty)) :0 ;read_unlock (&tasklist_lock); +mutex_unlock (&tty_mutex);spin_lock_irq (¤t->sighand->siglock); ac.ac_utime =encode_comp_t (jiffies_to_AHZ (cputime_to_jiffies (pacct->ac_utime)));
kernel/auditsc.c +5 -0
@@ -766,6 +766,8 @@audit_log_format (ab," success=%s exit=%ld" , (context->return_valid==AUDITSC_SUCCESS )?"yes" :"no" , context->return_code); + +mutex_lock (&tty_mutex);if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name) tty = tsk->signal->tty->name;else
@@ -787,6 +789,9 @@ context->gid, context->euid, context->suid, context->fsuid, context->egid, context->sgid, context->fsgid, tty); + +mutex_unlock (&tty_mutex); +audit_log_task_info (ab, tsk);if (context->filterkey) {audit_log_format (ab," key=" );
Arjan van de Ven
Acked-byQuoted 10 lines · Alan Cox
Ar Llu, 2006-09-04 am 15:36 +0100, ysgrifennodd Alan Cox:
Quoted 2 lines
Fairly basic stuff .. make sure the name we are encoding doesn't vanish under us.
Here's a replacement that is more paranoid about the locking as suggested by Arjan. The whole current->signal-> locking is all deeply strange but its for someone else to sort out. Add rather than replace the lock for
acct.cSigned-off-by Alan Cox <[email protected]>