From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795022688; b=4IIYjnhfTxW4gNBbGx/Rth0tV8t/X4DeDsMXEaX3pZx1CFYk5vvdLHTSJQr/fyB4qA6Q iSoW+HmHmXCTixfF2bL/1r0xPPGHbm2oNHdXiVNyq6sVjVECC8lghEg9wlV1i/Xi1Nb7W EUphAVW6s06NhczWjWlSMRDn0S1PB+5Vy4Q5tpPevmH2KAWxFM1JY0qkVy6vdpfw9CpYO g8uz6GNroLgCSWKT8mpTlC80jnCTMOlcTNY/SlmoXdD34KasTIVEnBA8CYrhvRsjymwzk Xr8h0x1vJC5+mKCpgvRw5MTxNkOFXq0019tsbUIQG2bmXBEnbytRZR7fPOON1rD3OUg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022688; 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=icPxhcaLAoRjPJzoW6BxmCH/wiLJMIpOwOBHjvO9szQ=; b=DA7S2dOOLhLUJnjND91mg7Ky5Ag20IMmGFN4PVB4FI2QhoF+Na37oCOllbOufQPa4ZPe UxpEnYKoSbRBfRqpWG51SbqQo7tWgTr91bTQh8NpRzbE3ZOsfklKjxwiMrkRClXhqHoqi vWFUiEQoSH92Az5OqCKtzp7W3TT9bzBY9thomQNsz6upUMtXdYXYVAIUSRnA3S7bp+B9Q HvHPIzlMskqZzJQ43Zm+Mr+8VJWlwwxPOEmbIO00C48BNhIulDxn6YR0Tbi42SHXFIFsq +aOdPsxdAcSEcc6VuSt9z3AHyyqng1m2STKbhwTxQU8KLt5yNZx/pvjWoUA31a4a5aA== 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=KfcuXyOE; 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 9784360A2602; Wed, 18 Nov 2026 17:24:48 +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=KfcuXyOE Received: by smtp.kernel.org (Postfix) with ESMTPSA id E94A01F000C4; Wed, 18 Nov 2026 17:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022688; bh=icPxhcaLAoRjPJzoW6BxmCH/wiLJMIpOwOBHjvO9szQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KfcuXyOExovs4yDbStix2zXNWjbVewRPHfg5uhA0QYFOw5+viV5UuOoorKrV+wQEm MWY4zcQya/PadB2ugbxOkuQMz4Xf26oGvcU+LPfbafviEmVFodlAwtQjuuvbX3QpC6 Xl3+j0b43eYQvb/C5Off1ESZkuzpuHym6BxJic5g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , "Lorenzo Stoakes (ARM)" , Rik van Riel , "Vlastimil Babka (SUSE)" , Barry Song , Pedro Falcato , "Harry Yoo (Meta)" , "Kiryl Shutsemau (Meta)" , SJ Park , Muhammad Usama Anjum , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.18 0103/2151] fork: take mmap_lock before copying mm_struct Date: Wed, 18 Nov 2026 15:30:38 +0100 Message-ID: <20261118150125.553915902@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Hildenbrand (Arm) [ Upstream commit ef694e2d210111cc08c52fd25da9ab130170bfa3 ] dup_mm() copies the parent's mm_struct before dup_mmap() takes the mmap_lock. A concurrent brk() can leave the child with a stale mm->brk and newer heap mappings, causing later brk() requests to fail. Other operations (e.g., PR_SET_MM) on the parent's mm_struct can similarly cause inconsistencies. As a simple and robust fix, grab the parent's mmap_lock earlier. This way we don't need to update individual mm fields in dup_mmap() and keep missing ones. Stop updating the 4 existing members (total_vm, data_vm, exec_vm, stack_vm), as that is now no longer required. Keep releasing the parent's mmap_lock in dup_mmap(), before userfaultfd completion, to avoid moving the userfaultfd handling into the caller. This should get cleaned up later. Move uprobe_start_dup_mmap() to preserve the lock ordering. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Reported-by: Josef Bacik Reviewed-by: Lorenzo Stoakes (ARM) Reviewed-by: Rik van Riel Reviewed-by: Vlastimil Babka (SUSE) Reviewed-by: Barry Song Reviewed-by: Pedro Falcato Reviewed-by: Harry Yoo (Meta) Reviewed-by: Kiryl Shutsemau (Meta) Reviewed-by: SJ Park Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-2-d6437171ecc3@kernel.org Signed-off-by: David Hildenbrand (Arm) [ sashal: Retained mm->user_ns as the third argument to mm_init(). ] Signed-off-by: Sasha Levin --- kernel/fork.c | 20 ++++++++++++++------ mm/mmap.c | 8 +------- mm/nommu.c | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index bc6078b910a6a..e38d2de6c6b52 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1487,12 +1487,19 @@ static struct mm_struct *dup_mm(struct task_struct *tsk, if (!mm) goto fail_nomem; + uprobe_start_dup_mmap(); + if (mmap_write_lock_killable(oldmm)) { + free_mm(mm); + goto fail_uprobe; + } + memcpy(mm, oldmm, sizeof(*mm)); - if (!mm_init(mm, tsk, mm->user_ns)) - goto fail_nomem; + if (!mm_init(mm, tsk, mm->user_ns)) { + mmap_write_unlock(oldmm); + goto fail_uprobe; + } - uprobe_start_dup_mmap(); err = dup_mmap(mm, oldmm); if (err) goto free_pt; @@ -1511,9 +1518,10 @@ static struct mm_struct *dup_mm(struct task_struct *tsk, mm->binfmt = NULL; mm_init_owner(mm, NULL); mmput(mm); - if (err) - uprobe_end_dup_mmap(); - + if (!err) + return NULL; +fail_uprobe: + uprobe_end_dup_mmap(); fail_nomem: return NULL; } diff --git a/mm/mmap.c b/mm/mmap.c index b29b31a29ef66..9bf16cc92f185 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1724,8 +1724,7 @@ __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) LIST_HEAD(uf); VMA_ITERATOR(vmi, mm, 0); - if (mmap_write_lock_killable(oldmm)) - return -EINTR; + mmap_assert_write_locked(oldmm); flush_cache_dup_mm(oldmm); uprobe_dup_mmap(oldmm, mm); /* @@ -1736,11 +1735,6 @@ __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) /* No ordering required: file already has been exposed. */ dup_mm_exe_file(mm, oldmm); - mm->total_vm = oldmm->total_vm; - mm->data_vm = oldmm->data_vm; - mm->exec_vm = oldmm->exec_vm; - mm->stack_vm = oldmm->stack_vm; - /* Use __mt_dup() to efficiently build an identical maple tree. */ retval = __mt_dup(&oldmm->mm_mt, &mm->mm_mt, GFP_KERNEL); if (unlikely(retval)) diff --git a/mm/nommu.c b/mm/nommu.c index d609ecdcf022b..be977f0dd0c10 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1896,7 +1896,7 @@ subsys_initcall(init_admin_reserve); int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) { - mmap_write_lock(oldmm); + mmap_assert_write_locked(oldmm); dup_mm_exe_file(mm, oldmm); mmap_write_unlock(oldmm); return 0; -- 2.53.0