Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060089; b=z0PKMBww+QJj+pDLKxIVmbXCITALWaxEvpHO31LaHsBL2v4hMA9HHF5mnpkHlaWngAj7 Bfu7fpsFL1jtYK9yVJuIY9SuqVCHQ9uBZf0zGMexh1rNwOQjb9TQGpMdE6aFGk+7COOD/ G198i9TrMpVXKs6foRvORBo3XdLAu2nbwQQoH8A/uVtyxgaDJsVVK+abD90hVz6/opE2R ian9nJaOKYWkFgBaU508PgWT8tUASWABvhqZP//2mF6CoRwWIYG1STdESmgx04+43Sv+t ryf5Om54UQ/g6ua9tM32L8mX73OWM7H/BKzM30qZMU/ZGhBBlvlF1Jq4bHUHmxKzTVQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060089; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ksFIthFuClpzOkbk5pjx0YU1r5LhBVtI3keIHMYRB04=; b=3XkSf2RU9zRK5VeLbqQTi+9xS7YpKI0JJrJQdPpAUmqY0ZWir3HeQYsmMeSakpsfTDRg CnDZ622QhvVjkEwf1+c1muNwVBzotZrV+fewNDjGubJ9t1bLUg7pF6KdNU9pxkPTlRk1c qXOUgfN8NJ4TsKmnF85/V2wuvc/E/X4eCf/vJPhZDDUPF32yZt1cCPTfocxdlcMQoijBm gm6jAhuWdPgSZotu641tMMe+AYOOGC4+9eZTVeEE6kBx9WKrbFX7BuamNecTpMmGrjPom GKkPU4vM6e/8w7g3TUvwzEXVr42yj+14tPJrQEFQDaHFrayJyvlm188BGRoAYlnWLng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="u2F/yTjA"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 202CB606A320; Thu, 19 Nov 2026 03:48:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=u2F/yTjA Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79FD61F000C4; Thu, 19 Nov 2026 03:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060089; bh=ksFIthFuClpzOkbk5pjx0YU1r5LhBVtI3keIHMYRB04=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=u2F/yTjA1f+FZ/Czp+aQylAx9FFWiOXgzGP/OgNP3SGE+AA46iBbfI+sX+cAkQLPn Q5kOglWVKvcDVLQAuQ8ZnJBsTPQXZq24nxxF/E36zW3iHVHhh+YdKfJX8bdlF8c494 Gg9VqeiT+vM1l6fFzi9w+bCUUm9FoX8xkWo48sGE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chris Mason , "Lorenzo Stoakes (ARM)" , Pedro Falcato , Muhammad Usama Anjum , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 5.10 1075/1848] mm/memory: reject remote COW faults on PFN mappings Date: Wed, 18 Nov 2026 15:51:53 +0100 Message-ID: <20261118150003.055431075@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Mason [ Upstream commit 8db6921cc07b74197a3866d62ed262b68aeadcf3 ] When handling a COW fault without a normal source page (PFN mappings), __wp_page_copy_user() copies from the faulting user address. For remote faults, this accesses the wrong address space, resulting in wrong data getting copied. For example, user_events updates an enable bit in the registering process's memory. If that memory needs to be faulted in, user_event_enabler_fault_fixup() calls fixup_user_fault() from a work item. Placing the enable bit in a private PFN mapping can trigger this remote COW path. Reject these faults with VM_FAULT_SIGBUS when the target mm differs from current->mm: remote faults. Ordinary (non-PFN) mappings are not affected. The user-address copy dates back to commit 6aab341e0a28 ("mm: re-architect the VM_UNPAGED logic"); likely, actual ways to get remote faults in there on COW PFN mappings appeared afterwards. But the fix is simple and straight forward. Fix generated by an LLM and sent by Chris Mason in private. Fixes: 6aab341e0a28 ("mm: re-architect the VM_UNPAGED logic") Cc: stable@vger.kernel.org Signed-off-by: Chris Mason Reviewed-by: Lorenzo Stoakes (ARM) [ david: simplify comment and description ] Reviewed-by: Pedro Falcato Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-35-d6437171ecc3@kernel.org Signed-off-by: David Hildenbrand (Arm) [ sashal: converted cow_user_page() from boolean to errno returns to match the upstream __wp_page_copy_user() interface ] Signed-off-by: Sasha Levin --- mm/memory.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index ad8184041a75b..ba72c16b1fb46 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2648,10 +2648,10 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, return same; } -static inline bool cow_user_page(struct page *dst, struct page *src, +static inline int cow_user_page(struct page *dst, struct page *src, struct vm_fault *vmf) { - bool ret; + int ret; void *kaddr; void __user *uaddr; bool locked = false; @@ -2661,9 +2661,16 @@ static inline bool cow_user_page(struct page *dst, struct page *src, if (likely(src)) { copy_user_highpage(dst, src, addr, vma); - return true; + return 0; } + /* + * __copy_from_user_inatomic() only works as expected for local faults. + * Reject remote faults. + */ + if (unlikely(mm != current->mm)) + return -EFAULT; + /* * If the source page was a PFN mapping, we don't have * a "struct page" for it. We do a best-effort copy by @@ -2688,7 +2695,7 @@ static inline bool cow_user_page(struct page *dst, struct page *src, * and update local tlb only */ update_mmu_tlb(vma, addr, vmf->pte); - ret = false; + ret = -EAGAIN; goto pte_unlock; } @@ -2713,7 +2720,7 @@ static inline bool cow_user_page(struct page *dst, struct page *src, if (!likely(pte_same(*vmf->pte, vmf->orig_pte))) { /* The PTE changed under us, update local tlb */ update_mmu_tlb(vma, addr, vmf->pte); - ret = false; + ret = -EAGAIN; goto pte_unlock; } @@ -2732,7 +2739,7 @@ static inline bool cow_user_page(struct page *dst, struct page *src, } } - ret = true; + ret = 0; pte_unlock: if (locked) @@ -2908,12 +2915,15 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) if (!new_page) goto oom; } else { + int err; + new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vmf->address); if (!new_page) goto oom; - if (!cow_user_page(new_page, old_page, vmf)) { + err = cow_user_page(new_page, old_page, vmf); + if (err) { /* * COW failed, if the fault was solved by other, * it's fine. If not, userspace would re-fault on @@ -2923,6 +2933,8 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) put_page(new_page); if (old_page) put_page(old_page); + if (err == -EFAULT) + return VM_FAULT_SIGBUS; return 0; } } -- 2.53.0