mm: do not BUG_ON missing brk mapping, because userspace can unmap it
Subsystems (2)
PATCH 1/1 mm: do not BUG_ON missing brk mapping, because userspace can unmap it
The following program will trigger the BUG_ON that this patch removes, because the user can munmap() mm->brk:
#include <sys/syscall.h>
#include <sys/mman.h>
#include <assert.h>
#include <unistd.h>
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: <TASK> 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 </TASK>
Instead, just error out if the original mapping has been removed.
--- mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
mm/mmap.c +1 -2
@@ -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.
Signature · 1 line
2.38.1
Quoted 59 lines · Jason A. Donenfeld
The following program will trigger the
BUG_ONthat this patch removes, because the user canmunmap()mm->brk:#include <sys/syscall.h> #include <sys/mman.h> #include <assert.h> #include <unistd.h> 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 SMPCPU: 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: <TASK> 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 </TASK>
Quoted 3 lines
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()")
That's 6.1-rc1 so probably fast track to Linus as we don't need to introduce such trivial local user DoS in 6.1, right?
Quoted 5 lines
Cc Liam R. Howlett <[email protected]>Cc Yu Zhao <[email protected]>Cc Catalin Marinas <[email protected]>Cc David Hildenbrand <[email protected]>Cc David Howells <[email protected]>
Quoted 8 lines
Cc Davidlohr Bueso <[email protected]>Cc Matthew Wilcox <[email protected]>Cc SeongJae Park <[email protected]>Cc Sven Schnelle <[email protected]>Cc Vlastimil Babka <[email protected]>Cc Will Deacon <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 18 lines
--- mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/mmap.c +1
-2@@ -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.
Quoted 84 lines · Jason A. Donenfeld
The following program will trigger the
BUG_ONthat this patch removes, because the user canmunmap()mm->brk:#include <sys/syscall.h> #include <sys/mman.h> #include <assert.h> #include <unistd.h> 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 SMPCPU: 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: <TASK> 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 </TASK>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 <[email protected]>Cc Yu Zhao <[email protected]>Cc Catalin Marinas <[email protected]>Cc David Hildenbrand <[email protected]>Cc David Howells <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Matthew Wilcox <[email protected]>Cc SeongJae Park <[email protected]>Cc Sven Schnelle <[email protected]>Cc Vlastimil Babka <[email protected]>Cc Will Deacon <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/mmap.c +0
-0
mm/mmap.c SYSCALL_DEFINE1(brk, unsigned long, brk) · line 230
Quoted 7 lines
mm/mmap.c +1
-2@@ -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. */
nit: The out label does not return an error as you specified in the comment, it returns "origbrk" doesn't it?
I actually had something like this prepared to reduce the calls to BUG_ON(), but I like this better.
Quoted 5 lines
mm/mmap.c +0
-0/* * mm->brk must be protected by write mmap_lock. Signature · 1 line
2.38.1
Quoted 61 lines · On Fri, 2 Dec 2022 17:27:24 +0100 "Jason A. Donenfeld" <[email protected]> wrote:
The following program will trigger the
BUG_ONthat this patch removes, because the user canmunmap()mm->brk:#include <sys/syscall.h> #include <sys/mman.h> #include <assert.h> #include <unistd.h> 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 SMPCPU: 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: <TASK> 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 </TASK>Instead, just error out if the original mapping has been removed.
Quoted 14 lines
Fixes 2e7ce7d354f2 ("mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()")Cc Liam R. Howlett <[email protected]>Cc Yu Zhao <[email protected]>Cc Catalin Marinas <[email protected]>Cc David Hildenbrand <[email protected]>Cc David Howells <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Matthew Wilcox <[email protected]>Cc SeongJae Park <[email protected]>Cc Sven Schnelle <[email protected]>Cc Vlastimil Babka <[email protected]>Cc Will Deacon <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Thanks,
SJ
Quoted 21 lines
--- mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/mmap.c +1
-2@@ -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. Signature · 1 line
2.38.1