From patchwork Sat Sep 21 12:08:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13808926 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 46F1F38FAD; Sat, 21 Sep 2024 12:08:40 +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=1726920521; cv=none; b=X8QhP+0UM2FVReQ0X2mQ2VE1/C6oS5DIbo9sIWGcvgMD2Ip/pUQOeGmEdeITheM3VeE/tfpB4pFOUTB6eDORnQjUEwOsZm43Um4ojjaLkt/aYavP3YvGGAGuz2APYjVtmD3v9ZVCJgVlyNQm4HS6FRnekUzOi2OIG474ESn2aIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726920521; c=relaxed/simple; bh=SOjzs+v7eOzqwKR2G9Ne4OiyrZ1NGf7Gf9sTP1nFP5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+UtM4fWYjHe1yJf2n4rqKQHpzS3lQ0ZZ6o5axX6y7z/w8sVAc85tyIay0AIVzYuCDbGo04igCapHNt4Ln9taoxOY6tIhjlfwxUIy1MfqZLSAA83pEcWzVNcFeVGM1ZukkkwK0PmCPrXrvcV3g9l5LqqaCnUhB/RmfDmji3r2uw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Fd/Ttpe/; 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="Fd/Ttpe/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7603EC4CEC2; Sat, 21 Sep 2024 12:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726920520; bh=SOjzs+v7eOzqwKR2G9Ne4OiyrZ1NGf7Gf9sTP1nFP5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fd/Ttpe/Z/Ej6Gy+jSS+qHgZn94zmhs+S2KBDGEam7ViCbpuNxYCYTTwZe1QXQnNr +W5v/v1xdET1KZsxq1ZSy8Rxe6ufNFxo1vDbOaoG5BZdzE5Cqa5cfkaloCWVGNCVXH 8eKxX7VIRfiAQ2bFvoKiydVuLSWRpfj+N8UHOODnLqNbscJk7nj60AcoYZy0RM1lcd ATojI4nJwusjhexfLE/dkLRtuS0MFfK5XguyxXl/p+KxYrufc/h+JF6W14+ybq3L8w ZFZRgtXOkivXuBogvCA5oC6zxF8Klavo3lcErgIvVtB9GAWT873Jb/EqRbip1ZfUCl dkiq+4BzJy6Sg== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: James.Bottomley@HansenPartnership.com, roberto.sassu@huawei.com, mapengyu@gmail.com, Jarkko Sakkinen , stable@vger.kernel.org, Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , Peter Huewe , Jason Gunthorpe , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 5/5] tpm: flush the auth session only when /dev/tpm0 is open Date: Sat, 21 Sep 2024 15:08:05 +0300 Message-ID: <20240921120811.1264985-6-jarkko@kernel.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240921120811.1264985-1-jarkko@kernel.org> References: <20240921120811.1264985-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: keyrings@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of flushing and reloading the auth session for every single transaction, keep the session open unless /dev/tpm0 is used. In practice this means applying TPM2_SA_CONTINUE_SESSION to the session attributes. Flush the session always when /dev/tpm0 is written. Reported-by: Pengyu Ma Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219229 Cc: stable@vger.kernel.org # v6.10+ Fixes: 7ca110f2679b ("tpm: Address !chip->auth in tpm_buf_append_hmac_session*()") Tested-by: Pengyu Ma Signed-off-by: Jarkko Sakkinen Reviewed-by: James Bottomley --- v5: - No changes. v4: - Changed as bug. v3: - Refined the commit message. - Removed the conditional for applying TPM2_SA_CONTINUE_SESSION only when /dev/tpm0 is open. It is not required as the auth session is flushed, not saved. v2: - A new patch. --- drivers/char/tpm/tpm-chip.c | 1 + drivers/char/tpm/tpm-dev-common.c | 1 + drivers/char/tpm/tpm-interface.c | 1 + drivers/char/tpm/tpm2-sessions.c | 3 +++ 4 files changed, 6 insertions(+) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 0ea00e32f575..7a6bb30d1f32 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -680,6 +680,7 @@ void tpm_chip_unregister(struct tpm_chip *chip) rc = tpm_try_get_ops(chip); if (!rc) { if (chip->flags & TPM_CHIP_FLAG_TPM2) { + tpm2_end_auth_session(chip); tpm2_flush_context(chip, chip->null_key); chip->null_key = 0; } diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c index 4eaa8e05c291..a3ed7a99a394 100644 --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -29,6 +29,7 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space, #ifdef CONFIG_TCG_TPM2_HMAC if (chip->flags & TPM_CHIP_FLAG_TPM2) { + tpm2_end_auth_session(chip); tpm2_flush_context(chip, chip->null_key); chip->null_key = 0; } diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index bfa47d48b0f2..2363018fa8fb 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -381,6 +381,7 @@ int tpm_pm_suspend(struct device *dev) if (!rc) { if (chip->flags & TPM_CHIP_FLAG_TPM2) { #ifdef CONFIG_TCG_TPM2_HMAC + tpm2_end_auth_session(chip); tpm2_flush_context(chip, chip->null_key); chip->null_key = 0; #endif diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c index a8d3d5d52178..38b92ad9e75f 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -333,6 +333,9 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf, } #ifdef CONFIG_TCG_TPM2_HMAC + /* The first write to /dev/tpm{rm0} will flush the session. */ + attributes |= TPM2_SA_CONTINUE_SESSION; + /* * The Architecture Guide requires us to strip trailing zeros * before computing the HMAC