From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8884031A81C for ; Wed, 1 Jul 2026 23:12:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782947542; cv=none; b=liaa0HQhT0Mm1byGyDB5x2NyMJeafr6ZfOWajGyMKtsXL0pmNTQze9YjIqt9ZJHiyA+GVPnUR5SRL37k27CGR9qQihpPPpv2G40upf+BxBS0xleTfm7enraVg2/JSQBh0YtbwE98SN+O3ezn0Jz1f0lB34TtnYqiv8ob8kMH/T4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782947542; c=relaxed/simple; bh=e2Mc99S14EwiVlrTIXj/dnyd1xTRih+Mv0plP40AMpo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iNS3TcottJXIxc0eIkDZPxQDiHsy7GS1N9hEFfXk4PsGM9kI/EVFsGXkkpXxOS/oMvQuGs5x3V9eWX7zVb+Pjj9qOWYF+UoCWrs7lSU35iP7RWUjtaZjOVwR7kF/6WtpOOxD1/mq6TgNwt8HgxwKyjD1mhIUQADlORpMYjU/buU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jjdev.com; spf=none smtp.mailfrom=jjdev.com; dkim=pass (2048-bit key) header.d=jjdev-com.20251104.gappssmtp.com header.i=@jjdev-com.20251104.gappssmtp.com header.b=a6Z67XBM; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jjdev.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=jjdev.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jjdev-com.20251104.gappssmtp.com header.i=@jjdev-com.20251104.gappssmtp.com header.b="a6Z67XBM" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-37e1607f7faso839409a91.1 for ; Wed, 01 Jul 2026 16:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jjdev-com.20251104.gappssmtp.com; s=20251104; t=1782947540; x=1783552340; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1dokrBTB60egFqlcTSb9K7bU6xTuOWrnhTXnVJVb3iw=; b=a6Z67XBMGfMHqV0Zq6ymj2ustnAktBSM8ZcqexC+sS2JQIcwUi4IEPq5TACgXJi46L vfVOwU/gUNkDw+2qEQWKVQDxtgOk4sEngrYrfwdqzuXDPD6ZasKcfP+IRlhlIRuuZyGT FHGokoFqnSZKBqCh0E32Uq6s7wGQE8UTeKHu5uJv61yXd8c9e55IuUPYS6M7Axn9Tdwq Dgeq4+iP3FTc3RgiFyIUpXPSrlhFv3eWqPmV+bA46bKz7v5iLscdgQvr/vk6+BjqO5rP 5nOsDX+3J8/6a7wu/bP4ja6oVhUK2E/4JmZXCHoY7ScK/NyitP4rXj/vbSnHx6FHIqo2 FwRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782947540; x=1783552340; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1dokrBTB60egFqlcTSb9K7bU6xTuOWrnhTXnVJVb3iw=; b=iTkpDfM0TOJWDYsoxioFzdtswd5dYd5NUzPwpqHFJN+NfmrR/X532flSZdnXfxTc08 knMteZu+dhwQxuOH2F63evxaLLD5N/Ldlltj+NZDGVES5g/biSRNegNQKrtwHA2H8DBz 44HgliVi92TF0IQ7grYIXx/aaOvoBq6HJ9yxUcKfvVWBDjTEwZprS3KHZ2xVyOwomyDY rmXiXhukoKpxbmPFyTqmNqOqFteU0AicXZpQ8VAkjaPEzZzOG4/sQxP3rejU+QUDJH2P 8quLzNxAZnGdVO7DMxfkYqfBO/2XcXfahigSXqdY8xUsVOf3zwD/IhCwCYbXrAOiIKBj 8oiw== X-Forwarded-Encrypted: i=1; AHgh+Rr3itouQmY42RhnP/9OaN1ro7usXDxrSkzPXD9nq2tanuSzPPjeHhk+1HJoK3s6pFf7xGZz9S44tsP0k5g=@vger.kernel.org X-Gm-Message-State: AOJu0Yzs/alMofpY467riL32I49GzwjOxBm1g2YmlGBRBcbze5vu2/aO Zeu8EII+BZ8HuYQr3wnNInNXXe/kxhAN7RX9UixlS05QWiEH77mZmHDwwPGdY6HV0ElK1Jy6Agv J8/EVKQ== X-Gm-Gg: AfdE7cnZTn8c2TcnzWmhTSoE0eP8777Mvh1vsZwZ/qfHOAZW2hdEOaJyjVTNSRwDamt HdbxmzJYvXr/3fWwLyI6SQK7vJxrrOrcwvVJYunb7J82h+y6fv8u6n++vW7J9n/5miByRniEqSL oPtclN6Vhroo5Dv2xC0vXs8bM+7G7bWW9/TwaK1mQRqYcCig2IGeMKxITs2e65gjoIz+K8I2bed SLow3YhkiAE+XkTF8+vC4H8Qo+FxVQpwIbFn18pxBX/WJvp4xXTnLoI/7QxMZRQFcCcPPiC4O8E VMvqDyei+G87qI3DIgXogVg4Y54fiJauVSFTvLQiDGLvPnF2bjVYzH0CzRfA0MUnTPT+zqXDAas q96icn3dQG1FUkey075s/ss2+uT5j9iFgFMv2ZIg9ZDT3YuvaoCELkTlLazM6aRIrNApsBkBZNg CgpOKamNK/SQ== X-Received: by 2002:a17:90a:d408:b0:380:7b4a:162 with SMTP id 98e67ed59e1d1-380aa12f611mr3830833a91.9.1782947539761; Wed, 01 Jul 2026 16:12:19 -0700 (PDT) Received: from jjbox.local.ftr ([47.151.31.186]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30f0b813c4dsm1968839eec.7.2026.07.01.16.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 16:12:19 -0700 (PDT) From: John de la Garza To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, John de la Garza Subject: [PATCH] tty: tty_jobctrl: use guard() in tiocgsid() Date: Wed, 1 Jul 2026 16:12:15 -0700 Message-ID: <20260701231215.4092457-1-john@jjdev.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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