mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
pstore/ram: Avoid NULL deref in ftrace merging failure path
[ Upstream commit8665569e97
] Given corruption in the ftrace records, it might be possible to allocate tmp_prz without assigning prz to it, but still marking it as needing to be freed, which would cause at least a NULL dereference. smatch warnings: fs/pstore/ram.c:340 ramoops_pstore_read() error: we previously assumed 'prz' could be null (see line 255) https://lists.01.org/pipermail/kbuild-all/2018-December/055528.html Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes:2fbea82bbb
("pstore: Merge per-CPU ftrace records into one") Cc: "Joel Fernandes (Google)" <joel@joelfernandes.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
9c6ca33f12
commit
6b6f6030af
1 changed files with 1 additions and 1 deletions
|
@ -301,6 +301,7 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record)
|
|||
GFP_KERNEL);
|
||||
if (!tmp_prz)
|
||||
return -ENOMEM;
|
||||
prz = tmp_prz;
|
||||
free_prz = true;
|
||||
|
||||
while (cxt->ftrace_read_cnt < cxt->max_ftrace_cnt) {
|
||||
|
@ -323,7 +324,6 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record)
|
|||
goto out;
|
||||
}
|
||||
record->id = 0;
|
||||
prz = tmp_prz;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue