From: Kees Cook <keescook@chromium.org>
Date: Mon, 30 Dec 2019 19:48:10 +0000 (-0800)
Subject: pstore/ram: Fix error-path memory leak in persistent_ram_new() callers
X-Git-Tag: v5.15~4782^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8df955a32a73315055e0cd187cbb1cea5820394b;p=platform%2Fkernel%2Flinux-starfive.git

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: Navid Emamdoost <navid.emamdoost@gmail.com>
Fixes: 1227daa43bce ("pstore/ram: Clarify resource reservation labels")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/lkml/20191211191353.14385-1-navid.emamdoost@gmail.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 8caff83..f753f3b 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -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",
 				name, record_size,
 				(unsigned long long)*paddr, err);
+			kfree(label);
 
 			while (i > 0) {
 				i--;
@@ -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",
 			name, sz, (unsigned long long)*paddr, err);
+		kfree(label);
 		return err;
 	}