Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pstore/platform: Add check for kstrdup

Browse source 
[ Upstream commit a19d48f7c5d57c0f0405a7d4334d1d38fe9d3c1c ]

Add check for the return value of kstrdup() and return the error
if it fails in order to avoid NULL pointer dereference.

Fixes: 563ca40ddf40 ("pstore/platform: Switch pstore_info::name to const")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230623022706.32125-1-jiasheng@iscas.ac.cn
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jiasheng Jiang 2023-06-23 10:27:06 +08:00 • committed by Ksawlii
parent d3a1a382b8
commit e087424fc6
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/pstore/platform.c
View file

@ -560,6 +560,8 @@ out:
*/ */
int pstore_register(struct pstore_info *psi) int pstore_register(struct pstore_info *psi)
{ {
char *new_backend;
if (backend && strcmp(backend, psi->name)) { if (backend && strcmp(backend, psi->name)) {
pr_warn("ignoring unexpected backend '%s'\n", psi->name); pr_warn("ignoring unexpected backend '%s'\n", psi->name);
return -EPERM; return -EPERM;
@ -579,11 +581,16 @@ int pstore_register(struct pstore_info *psi)
return -EINVAL; return -EINVAL;
} }
new_backend = kstrdup(psi->name, GFP_KERNEL);
if (!new_backend)
return -ENOMEM;
mutex_lock(&psinfo_lock); mutex_lock(&psinfo_lock);
if (psinfo) { if (psinfo) {
pr_warn("backend '%s' already loaded: ignoring '%s'\n", pr_warn("backend '%s' already loaded: ignoring '%s'\n",
psinfo->name, psi->name); psinfo->name, psi->name);
mutex_unlock(&psinfo_lock); mutex_unlock(&psinfo_lock);
kfree(new_backend);
return -EBUSY; return -EBUSY;
} }
@ -616,7 +623,7 @@ int pstore_register(struct pstore_info *psi)
* Update the module parameter backend, so it is visible * Update the module parameter backend, so it is visible
* through /sys/module/pstore/parameters/backend * through /sys/module/pstore/parameters/backend
*/ */
backend = kstrdup(psi->name, GFP_KERNEL); backend = new_backend;
pr_info("Registered %s as persistent store backend\n", psi->name); pr_info("Registered %s as persistent store backend\n", psi->name);