From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932543AbcAJFAj (ORCPT ); Sun, 10 Jan 2016 00:00:39 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33186 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756858AbcAJE70 (ORCPT ); Sat, 9 Jan 2016 23:59:26 -0500 From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-audit@redhat.com, linux-kernel@vger.kernel.org, Peter Hurley Subject: [RESEND][PATCH 13/15] tty: audit: Check audit enable first Date: Sat, 9 Jan 2016 20:59:06 -0800 Message-Id: <1452401948-30790-14-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452401948-30790-1-git-send-email-peter@hurleysoftware.com> References: <1447207560-16410-1-git-send-email-peter@hurleysoftware.com> <1452401948-30790-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Audit is unlikely to be enabled; check first to exit asap. Signed-off-by: Peter Hurley --- drivers/tty/tty_audit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c index 6e33e41..269e41f 100644 --- a/drivers/tty/tty_audit.c +++ b/drivers/tty/tty_audit.c @@ -211,6 +211,10 @@ void tty_audit_add_data(struct tty_struct *tty, const void *data, size_t size) unsigned int audit_tty; dev_t dev; + audit_tty = READ_ONCE(current->signal->audit_tty); + if (~audit_tty & AUDIT_TTY_ENABLE) + return; + if (unlikely(size == 0)) return; @@ -218,9 +222,6 @@ void tty_audit_add_data(struct tty_struct *tty, const void *data, size_t size) && tty->driver->subtype == PTY_TYPE_MASTER) return; - audit_tty = READ_ONCE(current->signal->audit_tty); - if (~audit_tty & AUDIT_TTY_ENABLE) - return; if ((~audit_tty & AUDIT_TTY_LOG_PASSWD) && icanon && !L_ECHO(tty)) return; -- 2.7.0