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 7E3BC3321C3; Thu, 27 Nov 2025 13:55:24 +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=1764251724; cv=none; b=jmSzXq6r5nkKTTCpElg8NbGfFPbkrXVGlpt9UR7rvxSv1TlEQYdvPqL0/+Kf8wnbzyPjygkitoBFCBhgoc/YJZBncjWUvIO70P7wHPncTwpv2y2Kpi18hfKyuLarEEETJf4Hn/6W3wzCZsoykczMIbHWu+yomY1b3CVtCUtWPRc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764251724; c=relaxed/simple; bh=oSZllqfhn/J0zaT5rxXsYyiJyHVBUxhg5ePx+xc2LXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GxJ4a5zVv2vcVbkxuS8rAlku0QK9cFwDhlz7qzJkkIBpzYMoZq3fmCCD0WeEtqB87LpSmex/GjW9pH6jg/q6Fx0qfd18P6560X0gVwlzy7l2ITBAW3kLVIi8LDlm3EVlyhSVFgU8Cv7rakzrhUUsH2Aavf5Lb6gqybl/kExp8tE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BROmpaS+; 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="BROmpaS+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 724CAC4CEF8; Thu, 27 Nov 2025 13:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764251724; bh=oSZllqfhn/J0zaT5rxXsYyiJyHVBUxhg5ePx+xc2LXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BROmpaS+tyN29C3zA1VUh64p7tnNMDNsk9ZaMvUMtxmohVyXNXsy6NIOeKp6eobRi 67e/efx9tx15RXgu8AgoZz8UXKDRx9mhLr0ZiEJlGszE0LzTE/NJ264f+rB7Ga8GPi LyUlauTT9GE1s1J/vmCgHsu6tHL6ufkVWzL11w/i/LLGcxI0w4Uy/scyqOd8/BJs9a L4SogK6b5ghIgqzCWnVY0SSSX5mt5m2KqFrQTt4epB/Dt/jkWimyHV+oNnRU6ewCgN Rnmx0vYIFOhfaTJrs9l6CRwMhQu8PxKG1k6U9/6FnV8iYzg4MceQflc33CRnGsgesu zbmSqe9mHQ8Lg== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: ross.philipson@oracle.com, Jonathan McDowell , Stefano Garzarella , Jarkko Sakkinen , Jonathan McDowell , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , Roberto Sassu , Mimi Zohar , linux-kernel@vger.kernel.org Subject: [PATCH v7 06/11] tpm2-sessions: Remove 'attributes' from tpm_buf_append_auth Date: Thu, 27 Nov 2025 15:54:38 +0200 Message-ID: <20251127135445.2141241-7-jarkko@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251127135445.2141241-1-jarkko@kernel.org> References: <20251127135445.2141241-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- v6: - No changes. v5: - No changes. 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 1393bfbeca64..ceffa3bd2b5c 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -206,7 +206,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); } tpm_buf_append_u32(&buf, chip->nr_allocated_banks); diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.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); 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 = 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 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; } diff --git a/include/linux/tpm.h b/include/linux/tpm.h index e5fc7b73de2d..5acf6422e2b9 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, -- 2.52.0