TPM: Avoid reference to potentially freed memory

[cascardo/linux.git] / drivers / char / tpm / tpm_of.c

diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index eebe625..570f30c 100644 (file)
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -24,14 +24,14 @@ int read_log(struct tpm_bios_log *log)
 {
        struct device_node *np;
        const u32 *sizep;
-       const __be64 *basep;
+       const u64 *basep;
 
        if (log->bios_event_log != NULL) {
                pr_err("%s: ERROR - Eventlog already initialized\n", __func__);
                return -EFAULT;
        }
 
-       np = of_find_node_by_name(NULL, "ibm,vtpm");
+       np = of_find_node_by_name(NULL, "vtpm");
        if (!np) {
                pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
                return -ENODEV;
@@ -53,17 +53,18 @@ int read_log(struct tpm_bios_log *log)
                goto cleanup_eio;
        }
 
-       of_node_put(np);
        log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
        if (!log->bios_event_log) {
                pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
                       __func__);
+               of_node_put(np);
                return -ENOMEM;
        }
 
        log->bios_event_log_end = log->bios_event_log + *sizep;
 
-       memcpy(log->bios_event_log, __va(be64_to_cpup(basep)), *sizep);
+       memcpy(log->bios_event_log, __va(*basep), *sizep);
+       of_node_put(np);
 
        return 0;