From 3db4dbc1818e892dca91d8452484e0cf3318c378 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 11 Jul 2021 21:59:06 -0700 Subject: [PATCH] kern: add missing abort on unmap failure --- libmesosphere/source/kern_k_device_address_space.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmesosphere/source/kern_k_device_address_space.cpp b/libmesosphere/source/kern_k_device_address_space.cpp index 401a1c9c..2d474ef6 100644 --- a/libmesosphere/source/kern_k_device_address_space.cpp +++ b/libmesosphere/source/kern_k_device_address_space.cpp @@ -120,7 +120,7 @@ namespace ams::kern { /* If we fail to unmap, we want to do a partial unlock. */ { - auto unlock_guard = SCOPE_GUARD { page_table->UnlockForDeviceAddressSpacePartialMap(process_address, size, size); }; + auto unlock_guard = SCOPE_GUARD { MESOSPHERE_R_ABORT_UNLESS(page_table->UnlockForDeviceAddressSpacePartialMap(process_address, size, size)); }; /* Unmap. */ R_TRY(m_table.Unmap(page_table, process_address, size, device_address));