Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=178554ae75739e91dc4d7c3e42a3db95448cc5bf
Commit:     178554ae75739e91dc4d7c3e42a3db95448cc5bf
Parent:     22982a5687d8abf7bafe6d307585464f47089f18
Author:     Jesper Juhl <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 00:31:48 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 08:44:20 2007 -0700

    Memory leak in tpm_ascii_bios_measurements_open()
    
    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'.
    
    Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
    Cc: Seiji Munetoh <[EMAIL PROTECTED]>
    Cc: Stefan Berger <[EMAIL PROTECTED]>
    Cc: Reiner Sailer <[EMAIL PROTECTED]>
    Cc: Kylene Hall <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/tpm/tpm_bios.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index 4eba32b..4b26ce4 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -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 = {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to