Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull pstore update from Tony Luck:
 "Fixes for pstore for 3.11 merge window"

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  efivars: If pstore_register fails, free unneeded pstore buffer
  acpi: Eliminate console msg if pstore.backend excludes ERST
  pstore: Return unique error if backend registration excluded by kernel param
  pstore: Fail to unlink if a driver has not defined pstore_erase
  pstore/ram: remove the power of buffer size limitation
  pstore/ram: avoid atomic accesses for ioremapped regions
  efi, pstore: Cocci spatch "memdup.spatch"

2 files changed, 20 insertions, 9 deletions

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 6d894bfd8b8f..f7b3b39e94fc 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -1180,20 +1180,28 @@ static int __init erst_init(void)
         if (!erst_erange.vaddr)
                 goto err_release_erange;
 
+        pr_info(ERST_PFX
+        "Error Record Serialization Table (ERST) support is initialized.\n");
+
         buf = kmalloc(erst_erange.size, GFP_KERNEL);
         spin_lock_init(&erst_info.buf_lock);
         if (buf) {
                 erst_info.buf = buf + sizeof(struct cper_pstore_record);
                 erst_info.bufsize = erst_erange.size -
                                     sizeof(struct cper_pstore_record);
-                if (pstore_register(&erst_info)) {
-                        pr_info(ERST_PFX "Could not register with persistent store\n");
+                rc = pstore_register(&erst_info);
+                if (rc) {
+                        if (rc != -EPERM)
+                                pr_info(ERST_PFX
+                                "Could not register with persistent store\n");
+                        erst_info.buf = NULL;
+                        erst_info.bufsize = 0;
                         kfree(buf);
                 }
-        }
-
-        pr_info(ERST_PFX
-        "Error Record Serialization Table (ERST) support is initialized.\n");
+        } else
+                pr_err(ERST_PFX
+                "Failed to allocate %lld bytes for persistent store error log\n",
+                erst_erange.size);
 
         return 0;
 
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 202d2c85ba2e..91864ad200ff 100644
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -79,10 +79,9 @@ static int efi_pstore_read_func(struct efivar_entry *entry, void *data)
                            &entry->var.DataSize, entry->var.Data);
         size = entry->var.DataSize;
 
-        *cb_data->buf = kmalloc(size, GFP_KERNEL);
+        *cb_data->buf = kmemdup(entry->var.Data, size, GFP_KERNEL);
         if (*cb_data->buf == NULL)
                 return -ENOMEM;
-        memcpy(*cb_data->buf, entry->var.Data, size);
         return size;
 }
 
@@ -236,7 +235,11 @@ static __init int efivars_pstore_init(void)
         efi_pstore_info.bufsize = 1024;
         spin_lock_init(&efi_pstore_info.buf_lock);
 
-        pstore_register(&efi_pstore_info);
+        if (pstore_register(&efi_pstore_info)) {
+                kfree(efi_pstore_info.buf);
+                efi_pstore_info.buf = NULL;
+                efi_pstore_info.bufsize = 0;
+        }
 
         return 0;
 }