From: Markus Elfring <Markus.Elfring@web.de>
To: linux-integrity@vger.kernel.org,
"Jarkko Sakkinen" <jarkko@kernel.org>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Peter Hüwe" <peterhuewe@gmx.de>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] tpm: efi: Improve exception handling in tpm_read_log_efi()
Date: Sun, 9 Mar 2025 14:50:14 +0100 [thread overview]
Message-ID: <76001d9d-fd98-42c3-9d93-6594e9de8e26@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 9 Mar 2025 14:43:52 +0100
Add a label so that a bit of exception handling can be better reused
from an if branch in this function implementation.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/char/tpm/eventlog/efi.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/eventlog/efi.c b/drivers/char/tpm/eventlog/efi.c
index 4e9d7c2bf32e..472292e9d52d 100644
--- a/drivers/char/tpm/eventlog/efi.c
+++ b/drivers/char/tpm/eventlog/efi.c
@@ -77,9 +77,7 @@ int tpm_read_log_efi(struct tpm_chip *chip)
MEMREMAP_WB);
if (!final_tbl) {
pr_err("Could not map UEFI TPM final log\n");
- devm_kfree(&chip->dev, log->bios_event_log);
- ret = -ENOMEM;
- goto out;
+ goto free_log;
}
/*
@@ -96,6 +94,7 @@ int tpm_read_log_efi(struct tpm_chip *chip)
log_size + final_events_log_size,
GFP_KERNEL);
if (!tmp) {
+free_log:
devm_kfree(&chip->dev, log->bios_event_log);
ret = -ENOMEM;
goto out;
--
2.48.1
reply other threads:[~2025-03-09 13:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=76001d9d-fd98-42c3-9d93-6594e9de8e26@web.de \
--to=markus.elfring@web.de \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®