From nobody Wed Feb 11 18:55:03 2026 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 BC661257827; Tue, 9 Dec 2025 10:06:06 +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=1765274767; cv=none; b=uaPSg8TfkdkqKD8lc9ItKHVNh4myPwbrB/9jwyTde3JlizHKSPrtOF2W6xKf9zPj0gacKO48t4cPg8KE73gIUg4iMCtazb7zigBzrm2QMVmVfQROkpRpVDz3j1yquequrd9DbsKuyivFPXRqngd8ROihukG4SlHv/lcbHjhTCBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765274767; c=relaxed/simple; bh=j3sRY/5DqDHwhme3v+bOihyZBmakSNazCo3LEzMzmDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=agfqoGgK6xlFPdZRHduCiLMaHaYpyb9iHvFtrilIA4/vloYe3ycsSmu59i2NnUqwWxYw723F088Uh9nljR8x1XgHCuSMjoZDl5qwzTLm95HcDT+bsVtW7MmlL2TN7wOPgXaoj6JjR5S1ah1zrA+KKnIxr8Dph318kR9HkStOkW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dD0pyKIk; 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="dD0pyKIk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DED2C4CEF5; Tue, 9 Dec 2025 10:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765274766; bh=j3sRY/5DqDHwhme3v+bOihyZBmakSNazCo3LEzMzmDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dD0pyKIk41a6EcxgBJquA8Ny8x0WcWOgcQWA9BlKKPJi94OuTgpD7pIIk9dm9eis5 65DYB1r5aMHGM1r5QipeJDGDLZ9hFJ1YOSNyfAmzLa5NdeDzAZVQGplVHBXoUVmvpX zpt75bYlHNDjWq6Ftb629qToUt/QtKV+2FXN26e7ul7TYBpjcip+YOvCA8bxTN+otk p31Uc3ACTMd+rkPJdGvwdJfv/z+23iD/dHaGjJNSMiFRLxnPCsdUU8cNucsYtYcmAr QN7sJWN4E3XubcPflCALvmuDIgal0Y1seEJE/QRel31OSqb78m5b0224V/cph3Y4ei sifeCemc5Bvzw== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , Peter Huewe , Jason Gunthorpe , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 4/5] tpm2-sessions: Remove AUTH_MAX_NAMES Date: Tue, 9 Dec 2025 12:05:27 +0200 Message-ID: <20251209100529.1700779-5-jarkko@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251209100529.1700779-1-jarkko@kernel.org> References: <20251209100529.1700779-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" 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-sessi= ons.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 =20 -/* 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) =20 @@ -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; }; =20 #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) !=3D TPM_HEADER_SIZE) { + dev_err(&chip->dev, "too many handles\n"); + ret =3D -EIO; + goto err; + } =20 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, } =20 #ifdef CONFIG_TCG_TPM2_HMAC - slot =3D (tpm_buf_length(buf) - TPM_HEADER_SIZE) / 4; - if (slot >=3D AUTH_MAX_NAMES) { - dev_err(&chip->dev, "too many handles\n"); - ret =3D -EIO; - goto err; - } auth =3D chip->auth; if (auth->session !=3D 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 +=3D 4; - memcpy(auth->name[slot], name, name_size); - auth->name_size_tbl[slot] =3D name_size; + memcpy(auth->name, name, name_size); + auth->name_size =3D name_size; #endif return 0; =20 -#ifdef CONFIG_TCG_TPM2_HMAC err: tpm2_end_auth_session(chip); return ret; -#endif } EXPORT_SYMBOL_GPL(tpm_buf_append_name); =20 @@ -658,8 +650,7 @@ int tpm_buf_fill_hmac_session(struct tpm_chip *chip, st= ruct tpm_buf *buf) /* ordinal is already BE */ sha256_update(&sctx, (u8 *)&head->ordinal, sizeof(head->ordinal)); /* add the handle names */ - for (i =3D 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 !=3D tpm_buf_length(buf)) sha256_update(&sctx, &buf->data[offset_s], tpm_buf_length(buf) - offset_s); --=20 2.52.0