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

[ Upstream commit e1fce564900f8734edf15b87f028c57e14f6e28d ]

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: 24a1e427dbd6 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 013486b5125ed78f80f10024c7c1f3d67fe8d647..65cbc8a60ca38f7ae8091d30a0a33392925343af 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -759,6 +759,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;
        }
 
@@ -766,6 +767,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;
        }