projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b81f0c
)
pstore/ram: Fix error return code in ramoops_probe()
author
Wang Yufen
<wangyufen@huawei.com>
Fri, 2 Dec 2022 08:22:54 +0000
(16:22 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:31:54 +0000
(13:31 +0100)
[ 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 <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>
fs/pstore/ram.c
patch
|
blob
|
history
diff --git
a/fs/pstore/ram.c
b/fs/pstore/ram.c
index fefe3d391d3af69b2205c95f9120ca4df9b0e46b..74e4d93f3e08d2216f9289e596f49068374cb374 100644
(file)
--- 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;
}