All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Peter Huewe <peterhuewe@gmx.de>, Jason Gunthorpe <jgg@ziepe.ca>,
	linux-integrity@vger.kernel.org, Andy Liang <andy.liang@hpe.com>,
	jenifer.golmitz@hpe.com
Subject: [PATCH] tpm/eventlog: Use kvmalloc() for event log buffer
Date: Thu,  7 Nov 2024 12:18:15 +0100	[thread overview]
Message-ID: <20241107112054.28448-1-tiwai@suse.de> (raw)

The TPM2 ACPI table may request a large size for the event log, and it
may be over the max size of kmalloc().  When this happens, the driver
spews the kernel WARNING at the probe time, but the error is
eventually ignored in the caller side, and it results in the missing
TPM event log exposure.

This patch replaces the devm_kmalloc() call with kvmalloc() to allow
larger sizes.  Since there is no devm variant for kvmalloc(), now it's
managed manually via devres_alloc() and devres_add().

Reported-and-tested-by: Andy Liang <andy.liang@hpe.com>
Cc: jenifer.golmitz@hpe.com
Link: https://bugzilla.suse.com/show_bug.cgi?id=1232421
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/char/tpm/eventlog/acpi.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
index 69533d0bfb51..56f7d73fa6bf 100644
--- a/drivers/char/tpm/eventlog/acpi.c
+++ b/drivers/char/tpm/eventlog/acpi.c
@@ -63,6 +63,13 @@ static bool tpm_is_tpm2_log(void *bios_event_log, u64 len)
 	return n == 0;
 }
 
+static void bios_event_log_release(struct device *dev, void *res)
+{
+	void **logp = res;
+
+	kvfree(*logp);
+}
+
 /* read binary bios log */
 int tpm_read_log_acpi(struct tpm_chip *chip)
 {
@@ -71,6 +78,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
 	void __iomem *virt;
 	u64 len, start;
 	struct tpm_bios_log *log;
+	void **logp;
 	struct acpi_table_tpm2 *tbl;
 	struct acpi_tpm2_phy *tpm2_phy;
 	int format;
@@ -136,9 +144,16 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
 	}
 
 	/* malloc EventLog space */
-	log->bios_event_log = devm_kmalloc(&chip->dev, len, GFP_KERNEL);
-	if (!log->bios_event_log)
+	logp = devres_alloc(bios_event_log_release, sizeof(*logp), GFP_KERNEL);
+	if (!logp)
 		return -ENOMEM;
+	devres_add(&chip->dev, logp);
+	log->bios_event_log = kvmalloc(len, GFP_KERNEL);
+	if (!log->bios_event_log) {
+		ret = -ENOMEM;
+		goto err;
+	}
+	*logp = log->bios_event_log;
 
 	log->bios_event_log_end = log->bios_event_log + len;
 
@@ -164,7 +179,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
 	return format;
 
 err:
-	devm_kfree(&chip->dev, log->bios_event_log);
+	devres_release(&chip->dev, bios_event_log_release, NULL, NULL);
 	log->bios_event_log = NULL;
 	return ret;
 }
-- 
2.43.0


             reply	other threads:[~2024-11-07 11:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-07 11:18 Takashi Iwai [this message]
2024-11-07 12:17 ` [PATCH] tpm/eventlog: Use kvmalloc() for event log buffer Paul Menzel
2024-11-07 12:38   ` Takashi Iwai
2024-11-07 19:06     ` Stefan Berger
2024-11-07 19:31       ` Stefan Berger
2024-11-08  8:24         ` Takashi Iwai
2024-11-08  8:48           ` Liang, Andy (Linux Ecosystem Engineering)
2024-11-08  9:28             ` Takashi Iwai
2024-11-11  8:43               ` Liang, Andy (Linux Ecosystem Engineering)
2024-11-12 17:56                 ` Jarkko Sakkinen
2024-11-13  3:00                   ` Liang, Andy (Linux Ecosystem Engineering)
2024-11-07 20:42   ` Jarkko Sakkinen
2024-11-08  8:22     ` Takashi Iwai
2024-11-07 20:32 ` Jarkko Sakkinen
2024-11-07 20:44   ` Jarkko Sakkinen
2024-11-08  8:21     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241107112054.28448-1-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=andy.liang@hpe.com \
    --cc=jarkko@kernel.org \
    --cc=jenifer.golmitz@hpe.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-integrity@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.