Commit 2de791ff authored Dec 02, 2022 by Wang Yufen Committed by Greg Kroah-Hartman Jan 18, 2023

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: 35da6094 ("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>

parent ded1b827

fs/pstore/ram.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}