From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 049F832AAC5 for ; Wed, 1 Jul 2026 21:49:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782942571; cv=none; b=n/3dDLGzIMx0x04BzeKxrvNa9UwUIW0Naun9aTytlT2g2dmfOcCAC3lMhFeSQDlAaIBOdya7nbP6tD/Tjq6raz5bl7VIJpvjP+RDccsP79JG3ytzaeSmERqYgAKqjFT2V740OFGJm0GfrVvU5Ed4rG/Rc06gonk5596PT+q4frA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782942571; c=relaxed/simple; bh=e2Mc99S14EwiVlrTIXj/dnyd1xTRih+Mv0plP40AMpo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=onTew/lRespvBPc+NgDUOipnfm4j+hIHPkEZlZCdwqKb4tt8BsZzkOPUL1nLH3DDhg7mEEyQ7RDeVW7Wzvee93/pjZlKgZ6IHKFabE2NnV+PY7y3mlsedlx/iQCKKUOZW1h02kCYXJWqW3qz29hc+muIrdASv58tohpUT0LbRRI= 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=pJBDzHIp; arc=none smtp.client-ip=209.85.216.51 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="pJBDzHIp" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-37ff8e0ad0fso817889a91.2 for ; Wed, 01 Jul 2026 14:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jjdev-com.20251104.gappssmtp.com; s=20251104; t=1782942568; x=1783547368; 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=pJBDzHIpsKpKIS38jm9SnAGUQpj4SqMh7VC7TDVSt8dSB/3WF6dPiJgWuHd4ofemxN KCFnyUT6GcomqqG1UQSx22Qcb++l8Ml9LQh1ZO1rX1Cnw9JLhsgeULlIPTiKrbCzluSK jiP0x8id71FCHWJ0hvVEXrYkMPdupicY7NFG1F2ezft/O0C+nhI91OWVnCTSP8TI7ZoZ NvP9Dwg1v10E/0FfA5Gewi2l5lLIiSCRCsjnAW1/sWYSdDSS8TTTk4hRBQa3YXypwKMV znV3S0jy7qRUwk0oEUYYy6hUp1/lXnd6tt3Szr7+18O1ZT4DZ6sICK945uvwfUSjwepH FHeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782942568; x=1783547368; 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=l+w/Vsg2ZDGa+mmSpTYlXhGP+xq+m+t4ZVvUamHtLydzQ3mXfDX1dkOxpJCtpNS6Kz BpOBCLJmZRUNpxYCnemzqs17E5kjUy6LtN4Z4NaSTeyDWAo7N4546Bu8WOYIMF5yrOx+ AiYpSJBtvAVmgEDIrXCRlEffpSVmTmykHalLapDelxdSjCNRJjocN3xrqx8iUwj3sXxe VGeqxmqo1Uf7Pwmmq4vzAUrz7i8Czo3D1TlBwDAUnca5XGxxXlNbx9nVXXtSvehB1xCD AcYa2rmk9ZxJ/+uUC+ClKM1zQE91xVwd2E5gX/ZqXfMgOLzQl98VxuX8qFSQS4SxyCYG Nm3A== X-Forwarded-Encrypted: i=1; AHgh+RrXwSUluhCudHLLUwE+sbVXS7eST0CgtpZkqA5vOnVA6IEwu3NxH4j1QxRA5a3wrWnG2DUqI41YubhXyK4=@vger.kernel.org X-Gm-Message-State: AOJu0YyKhVG/RBl+4N37PltFaGUCgBLHvwcvvyqaiH57YYcGoVb2MAWc q2yuOHUe12CzSOYBGd3kh6NgMnNRmpoYCSWvpP/N1A7arZ1/RLPrpX/AkfDuK09qgg== X-Gm-Gg: AfdE7clvi7p0F5UCMGpsjPk6kr3MEy9EwBWUPKuOILxtDORpmyIvjFgxXHIvIAp3Az9 29gFZpASPMFSb4II+aup+V2JOQI6aFJwAfBqio86+uSuYIwdYYWmNPRZC0jhuNmhYlbJittr14e SuGvZARWoUylhUq7wIXH6eu/fI9+8OF9TrxlYE66z7c0ttMe+Hl6yFd4tEPmVURLrA+i5zpqHe7 2hfOhbF+7Lc+b6WBYoZUEJQgMAlAfYT+NEU8T+vkVtZs24fv71JwedRD8LuCt8gSwBYLR4t5n5c oErXnhWhYrT3rNkapbA8ycvtQ46A3Mj5g64f+nLVgpmYbBWJPqr0brUEGv4ksAZqF6kvfeA25yU mdVw9xp9mTFr/sfJpRO6HcHRVWOpxu+RbDGBaSLe5HiwoSd5lU70tKPb/2vMXt6fRxjf0PEOVX1 9T0UURnkgiZg== X-Received: by 2002:a17:90b:5845:b0:36b:9e24:c692 with SMTP id 98e67ed59e1d1-380aa1c9748mr3074310a91.20.1782942568113; Wed, 01 Jul 2026 14:49:28 -0700 (PDT) Received: from jjbox.local.ftr ([47.151.31.186]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30f0bbdc4eesm1662488eec.24.2026.07.01.14.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 14:49:27 -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 14:49:25 -0700 Message-ID: <20260701214925.3966663-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