From: Wang Yufen Date: Fri, 2 Dec 2022 08:22:54 +0000 (+0800) Subject: pstore/ram: Fix error return code in ramoops_probe() X-Git-Tag: v5.15.92~1408 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95916147dcc7eeb01c3f0c0dbda3e9740bd5d1fe;p=platform%2Fkernel%2Flinux-rpi.git 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: 35da60941e44 ("pstore/ram: add Device Tree bindings") Signed-off-by: Wang Yufen Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/1669969374-46582-1-git-send-email-wangyufen@huawei.com Signed-off-by: Sasha Levin --- diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index fefe3d3..74e4d93 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -735,6 +735,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; } @@ -742,6 +743,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; }