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 E5FB23B8D70; Sat, 6 Dec 2025 11:31:32 +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=1765020693; cv=none; b=B970kFF3TgHTBejXMo++N3t2WZPADq9xGgSmYvsov0cKXHvjGyCARKIx9ZNSaZf7VwYTV7PGpheD2YZglncZJfT5wlwW500P8Pl4WDT1Hxv0EPkI5nsAxuPr3SH23svgDFqhiGBP50jLrXHjdg36x7FVLpkuU+CWtetx5z1wa3Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765020693; c=relaxed/simple; bh=45cAXobWOeNZdzx6rcVRF6pN400FT94dRvJt6iyB7MU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZW8LltJHVZDxGtr2fDnLS+2cOzudrJ6syb7DjMgF5NAFSOP1k4swERlWZ3whUWMFZPPtT/79dgC/lf5N+w20hAlyNdfWQSk8elYbRD1VBSYLB59zVd9CbcZh2qav5Zyz7sBOCBS3tUbBJtHUpNM9+51F28CVCOiQMhiEXPyY4qw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ae0jNGLY; 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="ae0jNGLY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0E80C4CEF5; Sat, 6 Dec 2025 11:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765020692; bh=45cAXobWOeNZdzx6rcVRF6pN400FT94dRvJt6iyB7MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ae0jNGLYev9eRyMepy5UZpLeoQ4DdY29DvganIuuT7aAFMFUv6c30HAWtTH4MQLUn VvTtaVoAgXReN/OT5Efg/zIXL+KcbLACL11vH/BbdX8Q4OQTYutqmPGletLPoVWj03 vyzQ0xG7bVxeUVHonz6XF9yMcVaCXIVEtT0X+cZessqjvDq3Zw+iN7kqxy6Ic/hT0j 70aQKCk/oMtVDSS8+wJWX58F6KOEid6b/3oravbAEsMJMc+FwCWUy6WqKeV7yw72N7 6sYZbfZU0riaqPG82l+VmXl/1mZiRCLib/V/7brNnpItL9g8x2EgtZ0yCW2Q4cv06W l/62jlS8VMmKQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , Jonathan McDowell , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org (open list), keyrings@vger.kernel.org (open list:KEYS-TRUSTED), linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH 2/3] tpm-buf: Remove chip parameter from tpm_buf_append_handle Date: Sat, 6 Dec 2025 13:31:09 +0200 Message-Id: <20251206113110.1793407-3-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251206113110.1793407-1-jarkko@kernel.org> References: <20251206113110.1793407-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jarkko Sakkinen Remove @chip from tpm_buf_append_handle() in order to decouple it from driver. This allows tpm-buf.c to be compiled as part of early boot code, thus providing a mechanism to build and parse TPM data. E.g., Trenchboot can use this to manage TPM2_PcrExtend protocol data as part of its early boot blob simply by compiling and linking the object file. Signed-off-by: Jarkko Sakkinen Reviewed-by: Jonathan McDowell --- drivers/char/tpm/tpm-buf.c | 5 ++--- drivers/char/tpm/tpm2-cmd.c | 2 +- drivers/char/tpm/tpm2-sessions.c | 2 +- include/linux/tpm.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/char/tpm/tpm-buf.c b/drivers/char/tpm/tpm-buf.c index 69ee77400539..1b9dee0d0681 100644 --- a/drivers/char/tpm/tpm-buf.c +++ b/drivers/char/tpm/tpm-buf.c @@ -147,20 +147,19 @@ EXPORT_SYMBOL_GPL(tpm_buf_append_u32); /** * tpm_buf_append_handle() - Add a handle - * @chip: &tpm_chip instance * @buf: &tpm_buf instance * @handle: a TPM object handle * * Add a handle to the buffer, and increase the count tracking the number of * handles in the command buffer. Works only for command buffers. */ -void tpm_buf_append_handle(struct tpm_chip *chip, struct tpm_buf *buf, u32 handle) +void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle) { if (buf->flags & TPM_BUF_INVALID) return; if (buf->flags & TPM_BUF_TPM2B) { - dev_err(&chip->dev, "Invalid buffer type (TPM2B)\n"); + WARN(1, "tpm-buf: invalid type: TPM2B\n"); buf->flags |= TPM_BUF_INVALID; return; } diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 3a77be7ebf4a..82076b6cfcf7 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -209,7 +209,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_handle(&buf, pcr_idx); tpm_buf_append_auth(chip, &buf, NULL, 0); } diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c index 4149379665c4..92d116d73c6f 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -257,7 +257,7 @@ int tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf, #endif if (!tpm2_chip_auth(chip)) { - tpm_buf_append_handle(chip, buf, handle); + tpm_buf_append_handle(buf, handle); return 0; } diff --git a/include/linux/tpm.h b/include/linux/tpm.h index aed34f119e8c..1e0585e45371 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -426,7 +426,7 @@ void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value); u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset); u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset); u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset); -void tpm_buf_append_handle(struct tpm_chip *chip, struct tpm_buf *buf, u32 handle); +void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle); /* * Check if TPM device is in the firmware upgrade mode. -- 2.39.5