From nobody Wed Oct 1 23:30:07 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 0EEC714A91; Mon, 29 Sep 2025 04:00:09 +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=1759118411; cv=none; b=YyxuCakPTUYdtMs4y28a5qo1lZuVe/eWaZzPkgj8hWoSpCi6STeSNIUwlyltW7eP40bxaRAIM4YugeC/KjG9lEZcVcRZU3F0wU2QxQk2fmbNoNmFoRMmscY+iQdgXTnH3wgwOR2A8edLC7H4pI8Hu/HEj8uHspwfQN3n6SqDjLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759118411; c=relaxed/simple; bh=iKBAauh/IVDSTPGyRj3HzKGmRyZQIGXTk8XjN2QIDwM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u8kzMUwMEAuJgpEVlQuqIUpBF5woa/iTaoeUpnof5vnOflfEJCwSi3IWuT6M8HaQ5OHQg8Q1FCy0WRq0nLEcbcFQPzeljyLolJRriVJO4Fj+FgHHmfE6ylscgeQy+KAJPSQdpMg3aWUz/oTmvHqwd3qRN0SWXjEEpQwbRseSaKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G0YR5dWI; 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="G0YR5dWI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B575C4CEF4; Mon, 29 Sep 2025 04:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759118409; bh=iKBAauh/IVDSTPGyRj3HzKGmRyZQIGXTk8XjN2QIDwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G0YR5dWI26l7E4nneRw7Ps6jlbTsCIFumk+3bzXiBZDi14dW8lQ4DAXsP0RQeG4LC 0tUqFnAe4Nc8Mha/HpVGnlXdmTedFeebgxdjDlfbuRKJul5YZZeVHvpyrWR1OGKuMt AvxbMMe8W+BVUYKFAOHpJsJapZnr3tq0g87ACnFZVMtpwl18Q7R4M9nF1mSNGlF90o yIM6lFxoacP4YSqqOfJnph5zj6GkkaybCkZfOWeCCcX7dlbtpzjl8Nn2DfqAWSiEhd +opA4IU6NEmOWzurnc1ea1a1cXKoyFeVmNuFegz4Y0HV73aC6DlYTdmsWeem0IX7pg rfeRNWoZIQxjA== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: dpsmith@apertussolutions.com, ross.philipson@oracle.com, Jarkko Sakkinen , 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 v2 4/9] tpm2-sessions: Remove 'attributes' from tpm_buf_append_auth Date: Mon, 29 Sep 2025 06:59:33 +0300 Message-Id: <20250929035938.1773341-5-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250929035938.1773341-1-jarkko@kernel.org> References: <20250929035938.1773341-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 --- 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 e416cc8705e3..c182a07b70de 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 51846317d662..1fa02e18e688 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -531,7 +531,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