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 313FC22B5AC; Wed, 10 Dec 2025 14:40:07 +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=1765377607; cv=none; b=CLe5Mp1HXKsWy/pcHgrXr+/fjcn9Hc7lu3xcuWLnVddC69Z5SMWzUCVccNTxdMocLGREfscHWKEV9P/RbKbfwVu9L0ETYNf9vvQ8dnZ5KTZKqK3r59vj3q4VulECWXSKS2UhGBkT9RBdZ3cc4Mr9TOXKSeND+iG8qX+3tE3cHiE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765377607; c=relaxed/simple; bh=j3sRY/5DqDHwhme3v+bOihyZBmakSNazCo3LEzMzmDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t+WRKmsdWKwU93ufDiQLpIYlTo7RpZa2lijhnpakFT5d5tGB5uYZETblvgKQnWDAzWY4ChjBo/IjzCY+anuoX6YGfJaqqxRJ+LDoIJGGkcKKv1OqGKtfa4/a2darYPBdrFS1zPTSazPY7X5OEJJksxVUBDlWlG1srQNl4O40p2E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JSqDof3E; 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="JSqDof3E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73042C4CEF7; Wed, 10 Dec 2025 14:40:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765377607; bh=j3sRY/5DqDHwhme3v+bOihyZBmakSNazCo3LEzMzmDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JSqDof3ELnyqwtpyh2iCtrsVhQf4ZkaoPzAbP8LshSh2tVqcJ9N+5NKOOHGponhxA 5Zpipbnr4Va878yw+O6dEluexs4/+tF2JbCv3drBBQ/dTxc/5fj59k85w5YyZEerGU HZUs60yFkn2qAreALmSiwL21RXyjzEszShRS9lbhE9l0szMDQS9SU1eXi314XMKF6d xWBfJ8yA25RIvd607cf0G7sV7JTJVIQNTSdnG1CbEKGqNwx3ESxDgOI4ma97SwDvaz F1Wg/DmdVClUsJOeo4LwtwjN1iWFD8jT8M2nv2qqHEd3zachxN+D0vIerP/DPenxZr lbk/yv9wJ+LXQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , Peter Huewe , Jason Gunthorpe , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , 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 v3 4/7] tpm2-sessions: Remove AUTH_MAX_NAMES Date: Wed, 10 Dec 2025 16:39:36 +0200 Message-ID: <20251210143940.264191-5-jarkko@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210143940.264191-1-jarkko@kernel.org> References: <20251210143940.264191-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: 8bit In all of the call sites only one session is ever append. Thus, reduce AUTH_MAX_NAMES, which leads into removing constant completely. Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm2-sessions.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c index 0816a91134fc..62a200ae72d7 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -72,9 +72,6 @@ #include #include -/* maximum number of names the TPM must remember for authorization */ -#define AUTH_MAX_NAMES 3 - #define AES_KEY_BYTES AES_KEYSIZE_128 #define AES_KEY_BITS (AES_KEY_BYTES*8) @@ -136,8 +133,8 @@ struct tpm2_auth { * handle, but they are part of the session by name, which * we must compute and remember */ - u8 name[AUTH_MAX_NAMES][TPM2_MAX_NAME_SIZE]; - u16 name_size_tbl[AUTH_MAX_NAMES]; + u8 name[TPM2_MAX_NAME_SIZE]; + u16 name_size; }; #ifdef CONFIG_TCG_TPM2_HMAC @@ -254,11 +251,14 @@ EXPORT_SYMBOL_GPL(tpm2_read_public); int tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf, u32 handle, u8 *name, u16 name_size) { -#ifdef CONFIG_TCG_TPM2_HMAC struct tpm2_auth *auth; - int slot; int ret; -#endif + + if (tpm_buf_length(buf) != TPM_HEADER_SIZE) { + dev_err(&chip->dev, "too many handles\n"); + ret = -EIO; + goto err; + } if (!tpm2_chip_auth(chip)) { tpm_buf_append_handle(buf, handle); @@ -266,12 +266,6 @@ int tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf, } #ifdef CONFIG_TCG_TPM2_HMAC - slot = (tpm_buf_length(buf) - TPM_HEADER_SIZE) / 4; - if (slot >= AUTH_MAX_NAMES) { - dev_err(&chip->dev, "too many handles\n"); - ret = -EIO; - goto err; - } auth = chip->auth; if (auth->session != tpm_buf_length(buf)) { dev_err(&chip->dev, "session state malformed"); @@ -280,16 +274,14 @@ int tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf, } tpm_buf_append_u32(buf, handle); auth->session += 4; - memcpy(auth->name[slot], name, name_size); - auth->name_size_tbl[slot] = name_size; + memcpy(auth->name, name, name_size); + auth->name_size = name_size; #endif return 0; -#ifdef CONFIG_TCG_TPM2_HMAC err: tpm2_end_auth_session(chip); return ret; -#endif } EXPORT_SYMBOL_GPL(tpm_buf_append_name); @@ -658,8 +650,7 @@ int tpm_buf_fill_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf) /* ordinal is already BE */ sha256_update(&sctx, (u8 *)&head->ordinal, sizeof(head->ordinal)); /* add the handle names */ - for (i = 0; i < handles; i++) - sha256_update(&sctx, auth->name[i], auth->name_size_tbl[i]); + sha256_update(&sctx, auth->name, auth->name_size); if (offset_s != tpm_buf_length(buf)) sha256_update(&sctx, &buf->data[offset_s], tpm_buf_length(buf) - offset_s); -- 2.52.0