Commit 8df955a3 authored by Kees Cook's avatar Kees Cook

pstore/ram: Fix error-path memory leak in persistent_ram_new() callers

For callers that allocated a label for persistent_ram_new(), if the call
fails, they must clean up the allocation.
Suggested-by: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Fixes: 1227daa4 ("pstore/ram: Clarify resource reservation labels")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/lkml/20191211191353.14385-1-navid.emamdoost@gmail.comSigned-off-by: default avatarKees Cook <keescook@chromium.org>
parent d1eef1c6
...@@ -577,6 +577,7 @@ static int ramoops_init_przs(const char *name, ...@@ -577,6 +577,7 @@ static int ramoops_init_przs(const char *name,
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n", dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
name, record_size, name, record_size,
(unsigned long long)*paddr, err); (unsigned long long)*paddr, err);
kfree(label);
while (i > 0) { while (i > 0) {
i--; i--;
...@@ -622,6 +623,7 @@ static int ramoops_init_prz(const char *name, ...@@ -622,6 +623,7 @@ static int ramoops_init_prz(const char *name,
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n", dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
name, sz, (unsigned long long)*paddr, err); name, sz, (unsigned long long)*paddr, err);
kfree(label);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment