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 B89CF11713; Fri, 28 Nov 2025 02:54:42 +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=1764298482; cv=none; b=e0TLhMWlzILn5aVq9Gntyq5MCgmz4Rhmm8rNC2y09L0pqcngZvURlyGskRRDGCWZIoIw4t5jTHK35ovLud6b87Wnsz4xNiGb3sN97WQIavo/loclU2Hw4KtNB08BYRbXMFQg5hBZ0G99s2HUO3A6egrCIyucgRS4sAwOMy8oycE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764298482; c=relaxed/simple; bh=02WZDor6RHI9qfDbaFRBiSJNXxkyBmtlbEwdim3MyEo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=acNDbHQVgY5KfopuYJwnWCrS5OI/6fnWZ3DiVovN2in6T26MwWdk9sW2HEcRsuPEVNsdZ1ZVx5nXYTlg9AQ0AgVs183PuwqPSU13StTHW/M+vtly+JTscyHhhUSXbR3lrsGW1FflrquTQ6yH2qhj2KtCBnsId4sevKWS0oUaNvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K27UCfhc; 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="K27UCfhc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFC26C4CEF8; Fri, 28 Nov 2025 02:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764298482; bh=02WZDor6RHI9qfDbaFRBiSJNXxkyBmtlbEwdim3MyEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K27UCfhcEERpxernClSXnI8sfvs7hpCU+Ib7qh9Ddp3epPQCtj9M83TsbMNUchMUB 02vM/9L85C3+zR9iFrJEOikORv93kEBNo9NOSNNz6JVLqb0GnEUlVieWLODAXguIiq /7+131KDkYCU8kt3VPjMBq9TwptEnwDTeeIGW3KBjCcozd+twfc6s+xJcRlrkVtv9y M/7H2Ty8kcZJIUGK6cYnHt3NKXP/OI7gwrNkv7bqDQ9F0cSdQjAHbefY2kK57l2rct Vsd6dM5/FnXYDK/zaUbhHPvvtbdl8ihI72udEnBss1yu2yvBnikPvU+xyKYmWW0EHS am3WnzXPaqh/Q== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: ross.philipson@oracle.com, Jonathan McDowell , Stefano Garzarella , Jarkko Sakkinen , James Bottomley , Jarkko Sakkinen , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 5/8] KEYS: trusted: Open code tpm2_buf_append() Date: Fri, 28 Nov 2025 04:53:57 +0200 Message-ID: <20251128025402.4147024-6-jarkko@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251128025402.4147024-1-jarkko@kernel.org> References: <20251128025402.4147024-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 tpm2_buf_append_auth() has only single call site and most of its parameters are redundant. Open code it to the call site. Remove illegit FIXME comment as there is no categorized bug and replace it with more sane comment about implementation (i.e. "non-opionated inline comment"). Signed-off-by: Jarkko Sakkinen Reviewed-by: Jonathan McDowell --- v6: - No changes. v5: - No changes. v4: - No changes. v3: - No changes. v2: - No changes. --- security/keys/trusted-keys/trusted_tpm2.c | 51 ++++------------------- 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 225b8c9932bf..8e2d1a013c7e 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -190,36 +190,6 @@ int tpm2_key_priv(void *context, size_t hdrlen, return 0; } -/** - * tpm2_buf_append_auth() - append TPMS_AUTH_COMMAND to the buffer. - * - * @buf: an allocated tpm_buf instance - * @session_handle: session handle - * @nonce: the session nonce, may be NULL if not used - * @nonce_len: the session nonce length, may be 0 if not used - * @attributes: the session attributes - * @hmac: the session HMAC or password, may be NULL if not used - * @hmac_len: the session HMAC or password length, maybe 0 if not used - */ -static void tpm2_buf_append_auth(struct tpm_buf *buf, u32 session_handle, - const u8 *nonce, u16 nonce_len, - u8 attributes, - const u8 *hmac, u16 hmac_len) -{ - tpm_buf_append_u32(buf, 9 + nonce_len + hmac_len); - tpm_buf_append_u32(buf, session_handle); - tpm_buf_append_u16(buf, nonce_len); - - if (nonce && nonce_len) - tpm_buf_append(buf, nonce, nonce_len); - - tpm_buf_append_u8(buf, attributes); - tpm_buf_append_u16(buf, hmac_len); - - if (hmac && hmac_len) - tpm_buf_append(buf, hmac, hmac_len); -} - /** * tpm2_seal_trusted() - seal the payload of a trusted key * @@ -494,19 +464,16 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, options->blobauth_len); } else { /* - * FIXME: The policy session was generated outside the - * kernel so we don't known the nonce and thus can't - * calculate a HMAC on it. Therefore, the user can - * only really use TPM2_PolicyPassword and we must - * send down the plain text password, which could be - * intercepted. We can still encrypt the returned - * key, but that's small comfort since the interposer - * could repeat our actions with the exfiltrated - * password. + * The policy session is generated outside the kernel, and thus + * the password will end up being unencrypted on the bus, as + * HMAC nonce cannot be calculated for it. */ - tpm2_buf_append_auth(&buf, options->policyhandle, - NULL /* nonce */, 0, 0, - options->blobauth, options->blobauth_len); + tpm_buf_append_u32(&buf, 9 + options->blobauth_len); + tpm_buf_append_u32(&buf, options->policyhandle); + tpm_buf_append_u16(&buf, 0); + tpm_buf_append_u8(&buf, 0); + tpm_buf_append_u16(&buf, options->blobauth_len); + tpm_buf_append(&buf, options->blobauth, options->blobauth_len); if (tpm2_chip_auth(chip)) { tpm_buf_append_hmac_session(chip, &buf, TPM2_SA_ENCRYPT, NULL, 0); } else { -- 2.52.0