From: Peter Hurley Date: Sun, 10 Jan 2016 06:55:34 +0000 (-0800) Subject: tty: audit: Remove false memory optimization X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c8b3185c41cd7f7c1e39c6e300daac8ef547e7e;p=linux-beck.git tty: audit: Remove false memory optimization The tty audit buffer is allocated at first use and not freed until the process exits. If tty audit is turned off after the audit buffer has been allocated, no effort is made to release the buffer. So re-checking if tty audit has just been turned off when tty audit was just on is false optimization; the likelihood of triggering this condition is exceedingly small. Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c index 3d90f88c5ff9..79439846d29d 100644 --- a/drivers/tty/tty_audit.c +++ b/drivers/tty/tty_audit.c @@ -200,8 +200,7 @@ int tty_audit_push(void) * tty_audit_buf_get - Get an audit buffer. * * Get an audit buffer, allocate it if necessary. Return %NULL - * if TTY auditing is disabled or out of memory. Otherwise, return a new - * reference to the buffer. + * if out of memory. Otherwise, return a new reference to the buffer. */ static struct tty_audit_buf *tty_audit_buf_get(void) { @@ -224,9 +223,6 @@ static struct tty_audit_buf *tty_audit_buf_get(void) return NULL; } - if (~current->signal->audit_tty & AUDIT_TTY_ENABLE) - goto out; - spin_lock_irqsave(¤t->sighand->siglock, flags); buf = current->signal->tty_audit_buf; if (!buf) {