From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15A2DC4321E for ; Fri, 2 Dec 2022 17:09:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 775C16B0071; Fri, 2 Dec 2022 12:09:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 726576B0073; Fri, 2 Dec 2022 12:09:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ED526B0074; Fri, 2 Dec 2022 12:09:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 514206B0071 for ; Fri, 2 Dec 2022 12:09:33 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D109C80A09 for ; Fri, 2 Dec 2022 17:09:32 +0000 (UTC) X-FDA: 80198002584.06.8322818 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 57DFDC0019 for ; Fri, 2 Dec 2022 17:09:31 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="fH/R5pCM"; spf=pass (imf22.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670000971; a=rsa-sha256; cv=none; b=vveLIGc7G54UgV2KtRGERivIF5oam1R0OZ5ayB5f0qwUOkRBeVhUUoIHwOJtHk3pp1979x 62C1HpFbrjkdZruu3fou3D/Dj/4nEoNf/3v+8+j5RLE/tvBMjJB3UIbj8UxRcF1FuvvO7x tyuxhurJHW192CfW7HVfhpeTrV7Vt2A= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="fH/R5pCM"; spf=pass (imf22.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670000971; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5WzQf//55U+5qYNlI9o6jeaBycgWr0vnkJT+PuZRyBg=; b=KIR+FGDCpLBeIQgvks17/PpRHi/fJ2gSZjFJP0nr0QgVhkMr/VU7ec6zCPvnZW5Rr5veh1 sZdF1Szp41B61+pnPxTEHgaeeWak/uM0YH/NJolu9xqdgDes4O4ls9NFAqf/E8mTbuZVl+ oxVgS4fso9fK9/iAl63wfKIVNanMdsQ= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5FCE462379; Fri, 2 Dec 2022 17:09:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8C0FC433C1; Fri, 2 Dec 2022 17:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670000969; bh=aleQ0G3RwMJMe6voe4CYfUe3I8+zy6zas8qBKUpPHCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fH/R5pCMFQsiBmQBrVMEP3NI7wzOghBsU05RHfMI/PHmccsdigox+u0ml9wUL1cuf X/G+Qplc+uFurErTIfA+A/qyXc4PU6Oakq2gCK+fmCJ/IS+xyV/c7D9OqNFcwRjflV +HmXh4N23rzNTM6P7hmUn0k3LAkp/XCiJFnAaFuICQWHae3oRKGuT7WMs9C/nqUNeT 8gNVAfHcgrKT2hBgvDaP6rVvnB9iCiCEuRPBfwrXttn8ZHQxR6ks7ZTpTm9GPiX1OD Jq0KZXA/06OP/6jNISroTnMvxhuuiVQwNmX12jDaiWVzvy7ObhGv+oujuyZD1Xgsyo yNsKUurRhtKIg== From: SeongJae Park To: "Jason A. Donenfeld" Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, "Liam R . Howlett" , Yu Zhao , Catalin Marinas , David Hildenbrand , David Howells , Davidlohr Bueso , Matthew Wilcox , SeongJae Park , Sven Schnelle , Vlastimil Babka , Will Deacon Subject: Re: [PATCH] mm: do not BUG_ON missing brk mapping, because userspace can unmap it Date: Fri, 2 Dec 2022 17:09:26 +0000 Message-Id: <20221202170926.1423-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221202162724.2009-1-Jason@zx2c4.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Spamd-Result: default: False [-2.40 / 9.00]; BAYES_HAM(-6.00)[99.99%]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; DMARC_POLICY_ALLOW(-0.50)[kernel.org,none]; R_DKIM_ALLOW(-0.20)[kernel.org:s=k20201202]; R_SPF_ALLOW(-0.20)[+a:dfw.source.kernel.org]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWELVE(0.00)[16]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[kernel.org:+]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 57DFDC0019 X-Rspamd-Server: rspam01 X-Stat-Signature: bb6g1st7fahna9ag7be4mxm6qtthyjq8 X-HE-Tag: 1670000971-371151 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, 2 Dec 2022 17:27:24 +0100 "Jason A. Donenfeld" wrote: > The following program will trigger the BUG_ON that this patch removes, > because the user can munmap() mm->brk: > > #include > #include > #include > #include > > static void *brk_now(void) > { > return (void *)syscall(SYS_brk, 0); > } > > static void brk_set(void *b) > { > assert(syscall(SYS_brk, b) != -1); > } > > int main(int argc, char *argv[]) > { > void *b = brk_now(); > brk_set(b + 4096); > assert(munmap(b - 4096, 4096 * 2) == 0); > brk_set(b); > return 0; > } > > Compile that with musl, since glibc actually uses brk(), and then > execute it, and it'll hit this splat: > > kernel BUG at mm/mmap.c:229! > invalid opcode: 0000 [#1] PREEMPT SMP > CPU: 12 PID: 1379 Comm: a.out Tainted: G S U 6.1.0-rc7+ #419 > RIP: 0010:__do_sys_brk+0x2fc/0x340 > Code: 00 00 4c 89 ef e8 04 d3 fe ff eb 9a be 01 00 00 00 4c 89 ff e8 35 e0 fe ff e9 6e ff ff ff 4d 89 a7 20> > RSP: 0018:ffff888140bc7eb0 EFLAGS: 00010246 > RAX: 0000000000000000 RBX: 00000000007e7000 RCX: ffff8881020fe000 > RDX: ffff8881020fe001 RSI: ffff8881955c9b00 RDI: ffff8881955c9b08 > RBP: 0000000000000000 R08: ffff8881955c9b00 R09: 00007ffc77844000 > R10: 0000000000000000 R11: 0000000000000001 R12: 00000000007e8000 > R13: 00000000007e8000 R14: 00000000007e7000 R15: ffff8881020fe000 > FS: 0000000000604298(0000) GS:ffff88901f700000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000000000603fe0 CR3: 000000015ba9a005 CR4: 0000000000770ee0 > PKRU: 55555554 > Call Trace: > > do_syscall_64+0x2b/0x50 > entry_SYSCALL_64_after_hwframe+0x46/0xb0 > RIP: 0033:0x400678 > Code: 10 4c 8d 41 08 4c 89 44 24 10 4c 8b 01 8b 4c 24 08 83 f9 2f 77 0a 4c 8d 4c 24 20 4c 01 c9 eb 05 48 8b> > RSP: 002b:00007ffc77863890 EFLAGS: 00000212 ORIG_RAX: 000000000000000c > RAX: ffffffffffffffda RBX: 000000000040031b RCX: 0000000000400678 > RDX: 00000000004006a1 RSI: 00000000007e6000 RDI: 00000000007e7000 > RBP: 00007ffc77863900 R08: 0000000000000000 R09: 00000000007e6000 > R10: 00007ffc77863930 R11: 0000000000000212 R12: 00007ffc77863978 > R13: 00007ffc77863988 R14: 0000000000000000 R15: 0000000000000000 > > > Instead, just error out if the original mapping has been removed. > > Fixes: 2e7ce7d354f2 ("mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()") > Cc: Liam R. Howlett > Cc: Yu Zhao > Cc: Catalin Marinas > Cc: David Hildenbrand > Cc: David Howells > Cc: Davidlohr Bueso > Cc: Matthew Wilcox > Cc: SeongJae Park > Cc: Sven Schnelle > Cc: Vlastimil Babka > Cc: Will Deacon > Cc: Andrew Morton > Signed-off-by: Jason A. Donenfeld Reviewed-by: SeongJae Park Thanks, SJ > --- > mm/mmap.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index c3c5c1d6103d..f5a37fe9a19e 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -226,8 +226,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) > /* Search one past newbrk */ > mas_set(&mas, newbrk); > brkvma = mas_find(&mas, oldbrk); > - BUG_ON(brkvma == NULL); > - if (brkvma->vm_start >= oldbrk) > + if (!brkvma || brkvma->vm_start >= oldbrk) > goto out; /* mapping intersects with an existing non-brk vma. */ > /* > * mm->brk must be protected by write mmap_lock. > -- > 2.38.1 >