tpm: Use managed allocation for bios event log

[ Upstream commit 441b7152729f4a2bdb100135a58625fa0aeb69e4 ]

Since the bios event log is freed in the device release function,
let devres handle the deallocation. This will allow other memory
allocation/mapping functions to be used for the bios event log.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Tested-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Stable-dep-of: a3a860bc0fd6 ("tpm: Change to kvalloc() in eventlog/acpi.c")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
index cd266021d0103954b7966aa289240ed4451521a5..bd757d836c5cf9ba53b6355da877d5907e32a8e7 100644 (file)
--- a/drivers/char/tpm/eventlog/acpi.c
+++ b/drivers/char/tpm/eventlog/acpi.c
@@ -14,6 +14,7 @@
  * Access to the event log extended by the TCG BIOS of PC platform
  */
 
+#include <linux/device.h>
 #include <linux/seq_file.h>
 #include <linux/fs.h>
 #include <linux/security.h>
@@ -135,7 +136,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
        }
 
        /* malloc EventLog space */
-       log->bios_event_log = kmalloc(len, GFP_KERNEL);
+       log->bios_event_log = devm_kmalloc(&chip->dev, len, GFP_KERNEL);
        if (!log->bios_event_log)
                return -ENOMEM;
 
@@ -164,7 +165,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
        return format;
 
 err:
-       kfree(log->bios_event_log);
+       devm_kfree(&chip->dev, log->bios_event_log);
        log->bios_event_log = NULL;
        return ret;
 }

diff --git a/drivers/char/tpm/eventlog/efi.c b/drivers/char/tpm/eventlog/efi.c
index e6cb9d525e30ca6457873ddc582baa21bd384264..4e9d7c2bf32ee4eb316fec055e2f5f1855e9cd52 100644 (file)
--- a/drivers/char/tpm/eventlog/efi.c
+++ b/drivers/char/tpm/eventlog/efi.c
@@ -6,6 +6,7 @@
  *      Thiebaud Weksteen <tweek@google.com>
  */
 
+#include <linux/device.h>
 #include <linux/efi.h>
 #include <linux/tpm_eventlog.h>
 
@@ -55,7 +56,7 @@ int tpm_read_log_efi(struct tpm_chip *chip)
        }
 
        /* malloc EventLog space */
-       log->bios_event_log = kmemdup(log_tbl->log, log_size, GFP_KERNEL);
+       log->bios_event_log = devm_kmemdup(&chip->dev, log_tbl->log, log_size, GFP_KERNEL);
        if (!log->bios_event_log) {
                ret = -ENOMEM;
                goto out;
@@ -76,7 +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");
-               kfree(log->bios_event_log);
+               devm_kfree(&chip->dev, log->bios_event_log);
                ret = -ENOMEM;
                goto out;
        }
@@ -91,11 +92,11 @@ int tpm_read_log_efi(struct tpm_chip *chip)
         * Allocate memory for the 'combined log' where we will append the
         * 'final events log' to.
         */
-       tmp = krealloc(log->bios_event_log,
-                      log_size + final_events_log_size,
-                      GFP_KERNEL);
+       tmp = devm_krealloc(&chip->dev, log->bios_event_log,
+                           log_size + final_events_log_size,
+                           GFP_KERNEL);
        if (!tmp) {
-               kfree(log->bios_event_log);
+               devm_kfree(&chip->dev, log->bios_event_log);
                ret = -ENOMEM;
                goto out;
        }

diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c
index a9ce66d09a754de85518df4e4d82cc742473dd43..741ab2204b11aa018da2c7bb5d59b75356f64f76 100644 (file)
--- a/drivers/char/tpm/eventlog/of.c
+++ b/drivers/char/tpm/eventlog/of.c
@@ -10,6 +10,7 @@
  * Read the event log created by the firmware on PPC64
  */
 
+#include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/tpm_eventlog.h>
@@ -65,7 +66,7 @@ int tpm_read_log_of(struct tpm_chip *chip)
                return -EIO;
        }
 
-       log->bios_event_log = kmemdup(__va(base), size, GFP_KERNEL);
+       log->bios_event_log = devm_kmemdup(&chip->dev, __va(base), size, GFP_KERNEL);
        if (!log->bios_event_log)
                return -ENOMEM;
 

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index ed600473ad7e3e63d4d27a7e634bb96dc59320fa..1e4f1a5049a55a5a07beeb051c1101507ab68f04 100644 (file)
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -267,7 +267,6 @@ static void tpm_dev_release(struct device *dev)
        idr_remove(&dev_nums_idr, chip->dev_num);
        mutex_unlock(&idr_lock);
 
-       kfree(chip->log.bios_event_log);
        kfree(chip->work_space.context_buf);
        kfree(chip->work_space.session_buf);
        kfree(chip->allocated_banks);