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

[ Upstream commit 05363abc7625cf18c96e67f50673cd07f11da5e9 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Ulrich Hecht <uli@kernel.org>
This commit is contained in:
Ruipeng Qi authored and Ulrich Hecht committed 2026-04-12 13:56:46 +08:00
1 parent afec3cd1f1
commit eaeeb2132c
1 file changed
+7
+7
View File
@@ -444,6 +444,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