]> www.infradead.org Git - users/jedix/linux-maple.git/commit
efi: fix potential NULL deref in efi_mem_reserve_persistent
authorAnton Gusev <aagusev@ispras.ru>
Fri, 3 Feb 2023 13:22:13 +0000 (16:22 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2023 10:28:11 +0000 (11:28 +0100)
commita2e6a9ff89f13666a1c3ff7195612ab949ea9afc
treeb8c3cd5909f1b3dc139f34f175b8eba474d52a16
parent70d40674a549d498bd63d5432acf46205da1534b
efi: fix potential NULL deref in efi_mem_reserve_persistent

[ Upstream commit 966d47e1f27c45507c5df82b2a2157e5a4fd3909 ]

When iterating on a linked list, a result of memremap is dereferenced
without checking it for NULL.

This patch adds a check that falls back on allocating a new page in
case memremap doesn't succeed.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 18df7577adae ("efi/memreserve: deal with memreserve entries in unmapped memory")
Signed-off-by: Anton Gusev <aagusev@ispras.ru>
[ardb: return -ENOMEM instead of breaking out of the loop]
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/efi/efi.c