On L1VH partitions where the VMM can provide overlay GPFNs, the kernel allocates the VP state and stats pages and supplies them to the hypervisor as overlay locations through hv_map_vp_state_page() and hv_map_stats_page(). The hypervisor may write intercept messages, register state, and statistics to these pages. Only a successful HVCALL_UNMAP_VP_STATE_PAGE or HVCALL_UNMAP_STATS_PAGE confirms that the corresponding overlay has been revoked. hv_unmap_vp_state_page() and hv_unmap_stats_page() free the overlay page regardless of the hypercall result. If the unmap fails, revocation is unconfirmed, but dropping the driver's page reference may still allow the page to be returned to the allocator and reused. A subsequent hypervisor write through a retained overlay could then corrupt an unrelated kernel or user allocation. Free an overlay page only after the unmap hypercall succeeds. On failure, leak the page rather than return memory that the hypervisor may still be able to access. This matches how the rest of drivers/hv handles pages whose state is unknown after a failed hypervisor operation; for example, hv_free_page() leaks a page that could not be re-encrypted. Log a failed VP state page unmap here because its teardown callers discard the return value. Fixes: 19c515c27cee ("mshv: Allocate vp state page for HVCALL_MAP_VP_STATE_PAGE on L1VH") Fixes: d62313bdf596 ("mshv: Introduce new hypercall to map stats page for L1VH partitions") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Yuho Choi --- Compile-tested with x86_64 defconfig, CONFIG_HYPERV=y, CONFIG_HYPERV_VMBUS=m, CONFIG_MSHV_ROOT=m, and W=1. Not tested on an L1VH system. No fault-injection reproducer was run for the failed-unmap paths. drivers/hv/mshv_root_hv_call.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/hv/mshv_root_hv_call.c b/drivers/hv/mshv_root_hv_call.c index cb55d4d4be2e5..9614cee4dad39 100644 --- a/drivers/hv/mshv_root_hv_call.c +++ b/drivers/hv/mshv_root_hv_call.c @@ -651,8 +651,18 @@ int hv_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type, { int ret = hv_call_unmap_vp_state_page(partition_id, vp_index, type, input_vtl); - if (mshv_use_overlay_gpfn() && state_page) - __free_page(state_page); + if (mshv_use_overlay_gpfn() && state_page) { + /* + * If the unmap failed, the hypervisor may still be using the + * page as an overlay. Leak it rather than handing it back to + * the page allocator. + */ + if (ret) + pr_err("%s: failed to unmap partition %llu vp %u state page type %u, leaking page: %d\n", + __func__, partition_id, vp_index, type, ret); + else + __free_page(state_page); + } return ret; } @@ -1003,7 +1013,12 @@ int hv_unmap_stats_page(enum hv_stats_object_type type, ret = hv_call_unmap_stats_page(type, identity); - if (mshv_use_overlay_gpfn() && page_addr) + /* + * If the unmap failed, the hypervisor may still be updating the + * overlay page. Leak it rather than handing it back to the page + * allocator. + */ + if (mshv_use_overlay_gpfn() && page_addr && !ret) __free_page(virt_to_page(page_addr)); return ret; -- 2.43.0