From: John de la Garza <john@jjdev.com>
To: gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
John de la Garza <john@jjdev.com>
Subject: [PATCH] tty: tty_jobctrl: use guard() in tiocgsid()
Date: Wed, 1 Jul 2026 16:12:15 -0700 [thread overview]
Message-ID: <20260701231215.4092457-1-john@jjdev.com> (raw)
guard()s express more clearly what the lock protects and let the
function return immediately instead of jumping to an unlock label.
Signed-off-by: John de la Garza <john@jjdev.com>
---
drivers/tty/tty_jobctrl.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/tty/tty_jobctrl.c b/drivers/tty/tty_jobctrl.c
index ef8741c3e662..939569f12119 100644
--- a/drivers/tty/tty_jobctrl.c
+++ b/drivers/tty/tty_jobctrl.c
@@ -542,7 +542,6 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
*/
static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
{
- unsigned long flags;
pid_t sid;
/*
@@ -552,17 +551,13 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t _
if (tty == real_tty && current->signal->tty != real_tty)
return -ENOTTY;
- spin_lock_irqsave(&real_tty->ctrl.lock, flags);
- if (!real_tty->ctrl.session)
- goto err;
- sid = pid_vnr(real_tty->ctrl.session);
- spin_unlock_irqrestore(&real_tty->ctrl.lock, flags);
+ scoped_guard(spinlock_irqsave, &real_tty->ctrl.lock) {
+ if (!real_tty->ctrl.session)
+ return -ENOTTY;
+ sid = pid_vnr(real_tty->ctrl.session);
+ }
return put_user(sid, p);
-
-err:
- spin_unlock_irqrestore(&real_tty->ctrl.lock, flags);
- return -ENOTTY;
}
/*
--
2.54.0
next reply other threads:[~2026-07-01 23:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 23:12 John de la Garza [this message]
2026-07-02 3:34 ` [PATCH] tty: tty_jobctrl: use guard() in tiocgsid() Jiri Slaby
-- strict thread matches above, loose matches on Subject: below --
2026-07-01 21:49 John de la Garza
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=20260701231215.4092457-1-john@jjdev.com \
--to=john@jjdev.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@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