From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B6C6E3E3C6D for ; Fri, 8 May 2026 17:24:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778261073; cv=none; b=cfITtN8l3oH1TQZgCquiiM57BpqPrzq6H5/l8YTiksHfYYGe9vu6P/mkWQ7Rw84zKixyIXmlMWWB97gER5w8WRm5kHdwJBWj/1tIgVlPbopccPxp+nqSFx119NpFHWwa1nQzbhdGTe70ur/t0KNtJmdeLoplft1G31OWfZEr984= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778261073; c=relaxed/simple; bh=0xhshe2tDNR1m7BlykJNVpQHvnxYhnLl4bFd8BrmU84=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ThK14IkXHC1/uVBjbTwmQhVao8UCT6iNHelRgDKGViTTanNLuRlE0GzfWpmqUPwS3IO52MYM9mosaJwFwudNB5IlOg5kIr+s7CcsfTOinhAIXzMOmupoRi75uq6dVj1OzUEECwl0Jid+hnLNWKHlqEdIN0tTppX9/Ln4R/1VZ1Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I5iiUA0E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I5iiUA0E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD1FDC2BCB0; Fri, 8 May 2026 17:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778261073; bh=0xhshe2tDNR1m7BlykJNVpQHvnxYhnLl4bFd8BrmU84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I5iiUA0Ebu2MY13Ou8Q5Uhgqhh3aG/rTiSBr7fq1iIQO4w4KS5Pv2AKaDzAILZSki rmUP9JTculS5GwTbnI1tJYiPp6mC8WT6IpwK1TYkVXWMFokjUqQ0rmKdSd0wUjvQm5 l3VYijmA45gATpkQTsbBxZ5uDKcr7M7CPi6Hsh6sybbrxE3hwLM1jSjvk1HVHjFhXK eUYxGfyDo5YgW8Ny4ovI0/40UjtYVu6JckCY3oG9rRps312/eEybY9pF2FXa6sP50E MMUb4qEc+M4qsqQYekTT6HZ+f7YDXen7JNeyBfhhoYNBAcMSYWhr1x204f4grh1cEl uOCaQxnUTk9/g== From: Sasha Levin To: stable@vger.kernel.org Cc: Alexander Steffen , Jarkko Sakkinen , Sasha Levin Subject: [PATCH 6.1.y 1/2] tpm_tis: Move CRC check to generic send routine Date: Fri, 8 May 2026 13:24:28 -0400 Message-ID: <20260508172429.1767444-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050324-jump-diploma-db0f@gregkh> References: <2026050324-jump-diploma-db0f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Alexander Steffen [ Upstream commit 32a0c860ff48543299772f7a98f32dd3ee9281b7 ] The CRC functionality is initialized before tpm_tis_core, so it can be used on all code paths within the module. Therefore, move the CRC check to the generic send routine, that also contains all other checks for successful command transmission, so that all those checks are in one place. Also, this ensures that tpm_tis_ready is called when a CRC failure is detected, to clear the invalid data from the TPM, which did not happen previously. Signed-off-by: Alexander Steffen Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Stable-dep-of: 949692da7211 ("tpm: tpm_tis: stop transmit if retries are exhausted") Signed-off-by: Sasha Levin --- drivers/char/tpm/tpm_tis_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 968b891bcb030..88a85aff3cb82 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -464,6 +464,12 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) goto out_err; } + rc = tpm_tis_verify_crc(priv, len, buf); + if (rc < 0) { + dev_err(&chip->dev, "CRC mismatch for command.\n"); + goto out_err; + } + return 0; out_err: @@ -517,12 +523,6 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) usleep_range(priv->timeout_min, priv->timeout_max); } - rc = tpm_tis_verify_crc(priv, len, buf); - if (rc < 0) { - dev_err(&chip->dev, "CRC mismatch for command.\n"); - return rc; - } - /* go and do it */ rc = tpm_tis_write8(priv, TPM_STS(priv->locality), TPM_STS_GO); if (rc < 0) -- 2.53.0