tpm: efi: Improve exception handling in tpm_read_log_efi()

Commit Message

Markus Elfring March 9, 2025, 1:50 p.m. UTC

From: Markus Elfring <[e-mail]>
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 <[e-mail]>
---
 drivers/char/tpm/eventlog/efi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--
2.48.1

Patch

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;