[PATCH 5.4 090/191] pstore/ram: Fix error-path memory leak in persistent_ram_new() callers

From: Greg Kroah-Hartman
Date: Tue Jan 07 2020 - 16:23:55 EST


From: Kees Cook <keescook@xxxxxxxxxxxx>

commit 8df955a32a73315055e0cd187cbb1cea5820394b upstream.

For callers that allocated a label for persistent_ram_new(), if the call
fails, they must clean up the allocation.

Suggested-by: Navid Emamdoost <navid.emamdoost@xxxxxxxxx>
Fixes: 1227daa43bce ("pstore/ram: Clarify resource reservation labels")
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/lkml/20191211191353.14385-1-navid.emamdoost@xxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
fs/pstore/ram.c | 2 ++
1 file changed, 2 insertions(+)

--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -588,6 +588,7 @@ static int ramoops_init_przs(const char
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
name, record_size,
(unsigned long long)*paddr, err);
+ kfree(label);

while (i > 0) {
i--;
@@ -633,6 +634,7 @@ static int ramoops_init_prz(const char *

dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
name, sz, (unsigned long long)*paddr, err);
+ kfree(label);
return err;
}