Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09F9A2EC09B; Sat, 12 Sep 2026 13:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789219214; cv=none; b=TQHi05sKiEYwFf+PNRl3W4RiweTmbYM+64oKGwUJNBW1pAPgZqIeR5kvhyJIOtJUWmhZ+c4GyxiyfkmceALhyOlawqkh4wbRv7MzVcx1pGhT3yhJQ4dF3vpnB0WVXAM/sVL6cD2imD4ICQoRaENJC9K9/noMuvqzuTAxs273e/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789219214; c=relaxed/simple; bh=XLhDJY+nGMn2hEq1Nw30RwdAd3xW2CYkJ3q1stEOh5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HFwsTExGi9CUdenAgBGcem9Ip7utsP9n/RmCu02xhfjwM2BJY8oCTiIKuIhwMJecbI1QU7nIkmsoScnME5rO9NCenrgsAPeVDscMgE+meKNHUXpdGf5ytdXVbG+lN4l8ImLXuFWNUa0F317dv3Y6K5HMtjWUMY2hwZx34XH2nww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GPQxuXZJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GPQxuXZJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56EBA1F000FF; Sat, 12 Sep 2026 13:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789219212; bh=PoP78EwdLe4lTujiDUg+WqnULr2wYN2S7VDNTufbKio=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GPQxuXZJK6hhoHZlbaGDIYGCoFwjcFxQ2vdeD/9fLquss26jZqnWlzucAXW7sRUVB FQeDjLBqf+QiSMIW0TEwxUBlE8sqY/FKMymEvk8w/I0ktGo+SbkJyW5LEJcMaIfEaq x7lmla5M3AEa57cxN5HQZi5cqypYxy7vjlgUubDk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ruoyu Wang , Jarkko Sakkinen , Sasha Levin Subject: [PATCH 6.12 1306/1376] tpm: st33zp24: Validate locality read result Date: Sat, 12 Sep 2026 09:02:12 +0200 Message-ID: <20260912065636.640268739@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruoyu Wang [ Upstream commit 264216889d39df509b9c8045df53529480b0b718 ] check_locality() treats every nonzero transport return as success. SPI errors remain negative, while the I2C path can convert a negative write error through its byte-sized status variable. Either result is nonzero even though the TPM_ACCESS byte can remain unwritten, so indeterminate ACTIVE_LOCALITY and VALID bits can falsely report an active locality. Require recv() to return exactly the requested byte before examining TPM_ACCESS. Transport errors and short reads now report an inactive locality, while successful reads retain the existing behavior. This issue was found by a static analysis checker and confirmed by manual source review. Fixes: 251a7b08213a ("TPM: STMicroelectronics ST33 I2C KERNEL 3.x") Signed-off-by: Ruoyu Wang Link: https://lore.kernel.org/r/20260813153032.3951878-2-ruoyuw560@gmail.com Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Sasha Levin --- drivers/char/tpm/st33zp24/st33zp24.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c index ebb6f4ec54a22..e3513015acae1 100644 --- a/drivers/char/tpm/st33zp24/st33zp24.c +++ b/drivers/char/tpm/st33zp24/st33zp24.c @@ -106,10 +106,10 @@ static bool check_locality(struct tpm_chip *chip) { struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev); u8 data; - u8 status; + int status; status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_ACCESS, &data, 1); - if (status && (data & + if (status == 1 && (data & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) return true; -- 2.53.0