Skip to contentSkip to conversation

Memory leak in tpm_ascii_bios_measurements_open() fix.

PATCH New Jesper Juhl 1 participant 1 message Jul 18, 2007 TPM device driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Memory leak in tpm_ascii_bios_measurements_open() fix.

Ehlo,

Coverity found a memory leak in tpm_ascii_bios_measurements_open().

If "read_log(log)" fails, then we may leak 'log' and 'log->bios_event_log'.

This patch should fix it, but please double check it. I don't know this code very well and the patch has only been compile tested.

---

 drivers/char/tpm/tpm_bios.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
drivers/char/tpm/tpm_bios.c +8 -3
index 4eba32b..4b26ce4 100644
@@ -427,7 +427,7 @@ static int tpm_ascii_bios_measurements_open(struct inode *inode,
 		return -ENOMEM;
 
 	if ((err = read_log(log)))
-		return err;
+		goto out_free;
 
 	/* now register seq file */
 	err = seq_open(file, &tpm_ascii_b_measurments_seqops);
@@ -435,10 +435,15 @@ static int tpm_ascii_bios_measurements_open(struct inode *inode,
 		seq = file->private_data;
 		seq->private = log;
 	} else {
-		kfree(log->bios_event_log);
-		kfree(log);
+		goto out_free;
 	}
+
+out:
 	return err;
+out_free:
+	kfree(log->bios_event_log);
+	kfree(log);
+	goto out;
 }
 
 const struct file_operations tpm_ascii_bios_measurements_ops = {