torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

pstore: ram_core: fix incorrect success return when vmap() fails

Browse Source 
In persistent_ram_vmap(), vmap() may return NULL on failure.

If offset is non-zero, adding offset_in_page(start) causes the function
to return a non-NULL pointer even though the mapping failed.
persistent_ram_buffer_map() therefore incorrectly returns success.

Subsequent access to prz->buffer may dereference an invalid address
and cause crashes.

Add proper NULL checking for vmap() failures.

Signed-off-by: Ruipeng Qi <ruipengqi3@gmail.com>
Link: https://patch.msgid.link/20260203020358.3315299-1-ruipengqi3@gmail.com
Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
Ruipeng Qi
2026-02-03 10:03:58 +08:00
committed by Kees Cook
parent 9448598b22
commit 05363abc76
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/pstore/ram_core.c
View File

@@ -446,6 +446,13 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size,
vaddr = vmap(pages, page_count, VM_MAP | VM_IOREMAP, prot);
kfree(pages);
/*
* vmap() may fail and return NULL. Do not add the offset in this
* case, otherwise a NULL mapping would appear successful.
*/
if (!vaddr)
return NULL;
/*
* Since vmap() uses page granularity, we must add the offset
* into the page here, to get the byte granularity address