summaryrefslogtreecommitdiffstats
path: root/fs/pstore
diff options
context:
space:
mode:
authorWang Yufen <wangyufen@huawei.com>2022-12-02 16:22:54 +0800
committerKees Cook <keescook@chromium.org>2022-12-02 15:16:59 -0800
commite1fce564900f8734edf15b87f028c57e14f6e28d (patch)
tree00714580ad5cf505aa742ce857dd6a77a451148b /fs/pstore
parent38b91847c314f49c80e30062549d4709a3754ea6 (diff)
downloadlinux-e1fce564900f8734edf15b87f028c57e14f6e28d.tar.gz
linux-e1fce564900f8734edf15b87f028c57e14f6e28d.tar.bz2
linux-e1fce564900f8734edf15b87f028c57e14f6e28d.zip
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
Diffstat (limited to 'fs/pstore')
-rw-r--r--fs/pstore/ram.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 5a39fa8522b0..9a5052431fd3 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;
}