From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
linux-audit@redhat.com, linux-kernel@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>
Subject: [RESEND][PATCH 05/15] tty: audit: Take siglock directly
Date: Sat, 9 Jan 2016 20:58:58 -0800 [thread overview]
Message-ID: <1452401948-30790-6-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1452401948-30790-1-git-send-email-peter@hurleysoftware.com>
lock_task_sighand() is for situations where the struct task_struct*
may disappear while trying to deref the sighand; this never applies
to 'current'.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/tty_audit.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 9effa81..5f65653 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -180,22 +180,19 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch)
int tty_audit_push_current(void)
{
struct tty_audit_buf *buf = ERR_PTR(-EPERM);
- struct task_struct *tsk = current;
unsigned long flags;
- if (!lock_task_sighand(tsk, &flags))
- return -ESRCH;
-
- if (tsk->signal->audit_tty) {
- buf = tsk->signal->tty_audit_buf;
+ spin_lock_irqsave(¤t->sighand->siglock, flags);
+ if (current->signal->audit_tty) {
+ buf = current->signal->tty_audit_buf;
if (buf)
atomic_inc(&buf->count);
}
- unlock_task_sighand(tsk, &flags);
+ spin_unlock_irqrestore(¤t->sighand->siglock, flags);
/*
* Return 0 when signal->audit_tty set
- * but tsk->signal->tty_audit_buf == NULL.
+ * but current->signal->tty_audit_buf == NULL.
*/
if (!buf || IS_ERR(buf))
return PTR_ERR(buf);
--
2.7.0
next prev parent reply other threads:[~2016-01-10 4:58 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 2:05 [PATCH 00/15] Rework tty audit Peter Hurley
2015-11-11 2:05 ` [PATCH 01/15] tty: audit: Early-out pty master reads earlier Peter Hurley
2015-11-11 2:05 ` [PATCH 02/15] tty: audit: Never audit packet mode Peter Hurley
2015-11-11 2:05 ` [PATCH 03/15] tty: audit: Remove icanon mode from call chain Peter Hurley
2015-11-12 19:10 ` Richard Guy Briggs
2015-11-12 19:58 ` Peter Hurley
2015-11-13 2:15 ` Richard Guy Briggs
2015-11-13 2:27 ` Peter Hurley
2015-11-13 3:28 ` Richard Guy Briggs
2015-11-16 13:25 ` Peter Hurley
2015-11-11 2:05 ` [PATCH 04/15] tty: audit: Defer audit buffer association Peter Hurley
2015-11-11 2:05 ` [PATCH 05/15] tty: audit: Take siglock directly Peter Hurley
2015-11-11 2:05 ` [PATCH 06/15] tty: audit: Ignore current association for audit push Peter Hurley
2015-11-11 2:05 ` [PATCH 07/15] tty: audit: Combine push functions Peter Hurley
2015-11-11 2:05 ` [PATCH 08/15] tty: audit: Track tty association with dev_t Peter Hurley
2015-11-11 2:05 ` [PATCH 09/15] tty: audit: Handle tty audit enable atomically Peter Hurley
2015-11-11 2:05 ` [PATCH 10/15] tty: audit: Remove false memory optimization Peter Hurley
2015-11-11 2:05 ` [PATCH 11/15] tty: audit: Remove tty_audit_buf reference counting Peter Hurley
2015-11-11 2:05 ` [PATCH 12/15] tty: audit: Simplify first-use allocation Peter Hurley
2015-11-11 2:05 ` [PATCH 13/15] tty: audit: Check audit enable first Peter Hurley
2015-11-11 2:05 ` [PATCH 14/15] tty: audit: Always push audit buffer before TIOCSTI Peter Hurley
2015-11-11 2:06 ` [PATCH 15/15] tty: audit: Poison tty_audit_buf while process exits Peter Hurley
2015-11-13 2:31 ` [PATCH 00/15] Rework tty audit Peter Hurley
2015-12-21 0:39 ` Paul Moore
2016-01-10 4:58 ` [RESEND][PATCH " Peter Hurley
2016-01-10 4:58 ` [RESEND][PATCH 01/15] tty: audit: Early-out pty master reads earlier Peter Hurley
2016-01-10 4:58 ` [RESEND][PATCH 02/15] tty: audit: Never audit packet mode Peter Hurley
2016-01-10 4:58 ` [RESEND][PATCH 03/15] tty: audit: Remove icanon mode from call chain Peter Hurley
2016-01-10 4:58 ` [RESEND][PATCH 04/15] tty: audit: Defer audit buffer association Peter Hurley
2016-01-10 4:58 ` Peter Hurley [this message]
2016-01-10 4:58 ` [RESEND][PATCH 06/15] tty: audit: Ignore current association for audit push Peter Hurley
2016-01-10 5:36 ` kbuild test robot
2016-01-10 7:00 ` Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 07/15] tty: audit: Combine push functions Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 08/15] tty: audit: Track tty association with dev_t Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 09/15] tty: audit: Handle tty audit enable atomically Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 10/15] tty: audit: Remove false memory optimization Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 11/15] tty: audit: Remove tty_audit_buf reference counting Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 12/15] tty: audit: Simplify first-use allocation Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 13/15] tty: audit: Check audit enable first Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 14/15] tty: audit: Always push audit buffer before TIOCSTI Peter Hurley
2016-01-10 4:59 ` [RESEND][PATCH 15/15] tty: audit: Poison tty_audit_buf while process exits Peter Hurley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452401948-30790-6-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).