From: Wang Yufen <wangyufen@huawei.com>
Date: Fri, 2 Dec 2022 08:22:54 +0000 (+0800)
Subject: pstore/ram: Fix error return code in ramoops_probe()
X-Git-Tag: v6.6.17~5839^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1fce564900f8734edf15b87f028c57e14f6e28d;p=platform%2Fkernel%2Flinux-rpi.git

pstore/ram: Fix error return code in ramoops_probe()

In the if (dev_of_node(dev) && !pdata) path, the "err" may be assigned a
value of 0, so the error return code -EINVAL may be incorrectly set
to 0. To fix set valid return code before calling to goto.

Fixes: 35da60941e44 ("pstore/ram: add Device Tree bindings")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/1669969374-46582-1-git-send-email-wangyufen@huawei.com
---

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 5a39fa8..9a50524 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -745,6 +745,7 @@ static int ramoops_probe(struct platform_device *pdev)
 	/* Make sure we didn't get bogus platform data pointer. */
 	if (!pdata) {
 		pr_err("NULL platform data\n");
+		err = -EINVAL;
 		goto fail_out;
 	}
 
@@ -752,6 +753,7 @@ static int ramoops_probe(struct platform_device *pdev)
 			!pdata->ftrace_size && !pdata->pmsg_size)) {
 		pr_err("The memory size and the record/console size must be "
 			"non-zero\n");
+		err = -EINVAL;
 		goto fail_out;
 	}