linux-kernel - [PATCH] tpm: efi: Improve exception handling in tpm_read_log

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <76001d9d-fd98-42c3-9d93-6594e9de8e26@web.de>
Date: Sun, 9 Mar 2025 14:50:14 +0100
From: Markus Elfring <Markus.Elfring@....de>
To: linux-integrity@...r.kernel.org, Jarkko Sakkinen <jarkko@...nel.org>,
 Jason Gunthorpe <jgg@...pe.ca>, Peter Hüwe
 <peterhuewe@....de>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] tpm: efi: Improve exception handling in tpm_read_log_efi()

From: Markus Elfring <elfring@...rs.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@...rs.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