From nobody Wed Oct 1 22:30:44 2025 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 885F12D23BC; Tue, 30 Sep 2025 23:20:23 +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=1759274423; cv=none; b=L+eK8auSr3d+J2x8Z+9Hq3AZN4xHQhQxzqthUOz85/FMcUki/dsZkpehGIfsiXC3QxSf4FYR8D8nr5o9LqlRJ6Us9jBan3GWEDN5+jwD/cKEcXa3LkGDo/BgL1Ob2vmhuuKygKmuivKStuvkb90e5slhEBi8diUb9ZqdEoZYwgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759274423; c=relaxed/simple; bh=KAREBsCu1dJZGKugFNTvgn3OVciTbDOxRzABM+NYbbs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TSEZXvtLNMEv/WmwCHR6Y7/2GY+tUD+78wTQPlgQKAFHlzzAJz8dCy2a69trovofQNDtHpyLaTWWW6T72VtUMhPMhLBeg/547NJreXmgDenrhchKEPuoJaHDzL+LiIqsRErvf2q4rrxI/1AeuY7GRKtF8YLaawTifgpagRmBh/Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mh0FLKnH; 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="mh0FLKnH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCB7BC4CEF0; Tue, 30 Sep 2025 23:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759274423; bh=KAREBsCu1dJZGKugFNTvgn3OVciTbDOxRzABM+NYbbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mh0FLKnHDTG/FkhN0GpUJBR1bAICAeZeSdLnpgBuiTU/RVYatVePlvEC/HglI6vO4 qLjkq2KAVrptwDQUY58A+iON64fIP9j+9czXt0T3mtBKHEpKCSl73mNbsHV+KZ2y3G MEgD4t3tUt6xnAoif/WkesAgnj64SZtwe/AH8O4A59k4JOPvORuPqkA6p0BFMtyuHX paUbXnB9QF9mRn4pQG537evD3/qhfCWiPaeQFqwFNc6NSWaqxZj9BLiJQJIWvgf8vA wlMW+EihkVmvudSENTDU+28FG/7dqEwoyudQb1gtbZ3vjC1hoWKq6MLEi4dLMwJxiU 0Vji8MduH/3jg== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: dpsmith@apertussolutions.com, ross.philipson@oracle.com, Jarkko Sakkinen , Jonathan McDowell , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , Roberto Sassu , Mimi Zohar , linux-kernel@vger.kernel.org (open list), keyrings@vger.kernel.org (open list:KEYS/KEYRINGS), linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH v5 4/9] tpm2-sessions: Remove 'attributes' from tpm_buf_append_auth Date: Wed, 1 Oct 2025 02:19:53 +0300 Message-Id: <20250930231958.1437783-5-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250930231958.1437783-1-jarkko@kernel.org> References: <20250930231958.1437783-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jarkko Sakkinen In a previous bug fix, 'attributes' was added by mistake to tpm_buf_append_auth(). Remove the parameter. Fixes: 27184f8905ba ("tpm: Opt-in in disable PCR integrity protection") Signed-off-by: Jarkko Sakkinen Reviewed-by: Jonathan McDowell --- v4: - No changes. v3: - No changes v2: - Uncorrupt the patch. --- drivers/char/tpm/tpm2-cmd.c | 2 +- drivers/char/tpm/tpm2-sessions.c | 5 ++--- include/linux/tpm.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 97501c567c34..bf8294e3d8f2 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -191,7 +191,7 @@ int tpm2_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, tpm_buf_append_hmac_session(chip, &buf, 0, NULL, 0); } else { tpm_buf_append_handle(chip, &buf, pcr_idx); - tpm_buf_append_auth(chip, &buf, 0, NULL, 0); + tpm_buf_append_auth(chip, &buf, NULL, 0); } =20 tpm_buf_append_u32(&buf, chip->nr_allocated_banks); diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessi= ons.c index 6d03c224e6b2..13f019d1312a 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -266,7 +266,7 @@ void tpm_buf_append_name(struct tpm_chip *chip, struct = tpm_buf *buf, EXPORT_SYMBOL_GPL(tpm_buf_append_name); =20 void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf, - u8 attributes, u8 *passphrase, int passphrase_len) + u8 *passphrase, int passphrase_len) { /* offset tells us where the sessions area begins */ int offset =3D buf->handles * 4 + TPM_HEADER_SIZE; @@ -327,8 +327,7 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip,= struct tpm_buf *buf, #endif =20 if (!tpm2_chip_auth(chip)) { - tpm_buf_append_auth(chip, buf, attributes, passphrase, - passphrase_len); + tpm_buf_append_auth(chip, buf, passphrase, passphrase_len); return; } =20 diff --git a/include/linux/tpm.h b/include/linux/tpm.h index dff558140c69..5b44222a36c4 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -535,7 +535,7 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip,= struct tpm_buf *buf, u8 attributes, u8 *passphrase, int passphraselen); void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf, - u8 attributes, u8 *passphrase, int passphraselen); + u8 *passphrase, int passphraselen); static inline void tpm_buf_append_hmac_session_opt(struct tpm_chip *chip, struct tpm_buf *buf, u8 attributes, --=20 2.39.5