From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 1275548A2B6 for ; Thu, 13 Aug 2026 15:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786635048; cv=none; b=tpOeMd9AuDFdf1V5k+kk1EtJ17nGnsvY4MskPJHViGY4XFRx49KsrP1pPcoAJR2XKVh6VtxBI464s9+ahcL4YYnHdElzXhJSzZtf7QbDVAHvxa1iA2Y7G25FGO+gzkiqpDxYgXPiA04+8WzdioaNYcIcMYOb36JbkjKylwUjqFI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786635048; c=relaxed/simple; bh=zS4yBiMhynVY+GeN45tgiN2toKrueGRWsHvxyPuW1X8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qpYYvj6UJJniEPGdljAAf0RibNsKGlGQ9P+V1r5ISAR0xQmLb13Mj08GC4w/Hl4ecNpm80ROwdmL7A+kR0fwLzFCeOnnmFRfnxIQd1+C+WmSEfAIafif34xtgKzMkOQgxXGET78wDb9jVX8cuJgyFsGFPMB4xXu9iOgp4Jt6Jxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d11QVxWS; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d11QVxWS" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-8485bd28dd0so2607260b3a.2 for ; Thu, 13 Aug 2026 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786635046; x=1787239846; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7PUKjGwrD+vFs6TW/81bEPyuY0N1UHpM7KlRzR6uxjE=; b=d11QVxWS/IfScxxF4PKzzDbi6PXSHX0hzX9GRW3uBacFcIaPfRKnkTQTKxJYCxRO9b x1yC26Gwc5Br3+VCeMj2pTBzxhPmA8oitOgDX3mO0lK/3N2bcJQ5Z5OPORxKh3u43XMU DBRt/GnB5pNuVTRjch5Yi0vqouhHjgtZIOaRd9WRmB5N8nH+RAk/UdYDpLmVZ9c2O8F9 ImvAiypLPZz8iA6KqlS7HXBnIlJUvjnjYnp9XWlzRWKiGEf1Y/FBP4/iu8/UxqppcnFd 9dSuVe5rhdI6R/mGs58fvx8Clh8fNcMHzLXVZtgmtwS+qQswryCkaWx05yVmSc4djw1a LESA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786635046; x=1787239846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=7PUKjGwrD+vFs6TW/81bEPyuY0N1UHpM7KlRzR6uxjE=; b=XOIuMNLUuNdrUzzha9lurfZqrbI2AiK8gq6RDnwRe6UdufZ2Siu+IDtf75NDFhQIxf OQw4e4+442j3dH40fW6N2OyrEij9+LFlkhgJiREzhJITxgjEsKkh8sGmGw/iRwZ26HZy NYaTZmSZUbH+Ffn8y+xHviLt/ARp778m9SakvhfUSkBXG9NDtrPY2xHLCCr8xyeSMdqv DTqkNR084rCf1xJ3MfZrs5r6DNwwaJP0lB6Pna4PiC4GF4Z33hhwi6xywDJQut/sY97U omO4bDdpEuOU9RhyfRYv4/Z0KZv0GdsdZrTgIBaPOIzAFrPG7i57Dq06Ufk7nkK8h/bT n/5g== X-Forwarded-Encrypted: i=1; AHgh+RrNnIP4hylnoX6G+xdU5iJK+ZmqHTS8i7IUiPUyrJrY1b2iiA2o1r3DgM+vZD7uJgnq+XwUY2+rlXfDTQw=@vger.kernel.org X-Gm-Message-State: AOJu0YxpXkAGOdnulAZqY1/dbFMBX7qII1cZq5Mwb5+IC+qWCUs1x0xe LH/w81KZrV7BuXsUeVkpD7ZGiLFEzR1rxcmuyH0IdHzmWvzJh2s/C9cp X-Gm-Gg: AR+sD13cKVu9Y/6viVDw1g7LR/2U2JUGwMJM76y4wFxihATTRA2K6zQwESKsgpSfJHK OZBzdWAayLOu7+jVrQ5ZiZGWSOLByh7ux07ndqAiSLRqejECEMPoJBBOgKqG/oLVJgaCw6w+vX7 b3xLUw4u87bUobKMa5FSTPGpViEo4ahPatlpiUbt5xtJEF/beUugvwbwJ2gX4lYmuMAcVaItoQW IZJODT/7V4buoKhxQAEoFbkZooXy1uKV4ZcZHmsQoWPPftmdUo3Td5zzSmYL7DQ0pTyyquOcFOr XTz2l2URGSOgvSO0ssznGAYbbN1tVUP0qUXIg5EcYzSSmAA7sopU9UtMIpRzbuOWHesssWfP7+j cyvQds2yb1WV2/VU2EhtKcW9rlqEcjTeQVaj6bx2izACM/+H8ta3hHZcUkAV3mX9LtWGh22X9xn kcHiHZ0aXIsCK3l9NYYVIEYNkNBpsoNnUoeizqW44sGoLjc1PmuFJoQ3RVLV6zIL26GpCJBvGVs pDer7s= X-Received: by 2002:a05:6a00:4501:b0:848:19f4:3b52 with SMTP id d2e1a72fcca58-84fc768405emr8166658b3a.38.1786635041601; Thu, 13 Aug 2026 08:30:41 -0700 (PDT) Received: from haichao.tail057a43.ts.net ([2001:da8:e000:1206:3b7:6da1:c188:d14f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84fc477e53esm1134246b3a.14.2026.08.13.08.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 08:30:41 -0700 (PDT) From: Ruoyu Wang To: linux-integrity@vger.kernel.org Cc: peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca, linux-kernel@vger.kernel.org, Ruoyu Wang Subject: [PATCH 2/2] tpm: st33zp24: Validate locality read result Date: Thu, 13 Aug 2026 23:30:32 +0800 Message-ID: <20260813153032.3951878-2-ruoyuw560@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260813153032.3951878-1-ruoyuw560@gmail.com> References: <20260813153032.3951878-1-ruoyuw560@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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 898e8d01d26698..0e2deff94c3672 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.51.0