From: Kees Cook 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.4.9~101 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50d18b655bb0b7dce04d0594e9bf9390ff1a4bdf;p=thirdparty%2Fkernel%2Fstable.git pstore/ram: Fix error-path memory leak in persistent_ram_new() callers 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 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index d9d8056325735..487ee39b438a7 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -588,6 +588,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--; @@ -633,6 +634,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; }