On Fri, 2018-05-18 at 00:35 +0100, Dmitry Safonov wrote:
> The x86 mmap() code selects the mmap base for an allocation depending
> on
> the bitness of the syscall. For 64bit sycalls it select mm->mmap_base
> and
> for 32bit mm->mmap_compat_base.
>
> exec() calls mmap() which in turn uses in_compat_syscall() to check
> whether
> the mapping is for a 32bit or a 64bit task. The decision is made on
> the
> following criteria:
>
> ia32 child->thread.status & TS_COMPAT
> x32 child->pt_regs.orig_ax & __X32_SYSCALL_BIT
> ia64 !ia32 && !x32
>
> __set_personality_x32() was dropping TS_COMPAT flag, but
> set_personality_64bit() has kept compat syscall flag making
> in_compat_syscall() return true during the first exec() syscall.
>
> Which in result has user-visible effects, mentioned by Alexey:
> 1) It breaks ASAN
> $ gcc -fsanitize=address wrap.c -o wrap-asan
> $ ./wrap32 ./wrap-asan true
> ==1217==Shadow memory range interleaves with an existing memory
> mapping. ASan cannot proceed correctly. ABORTING.
> ==1217==ASan shadow was supposed to be located in the
> [0x00007fff7000-0x10007fff7fff] range.
> ==1217==Process memory map follows:
> 0x000000400000-0x000000401000 /home/izbyshev/test/gcc/asan-
> exec-from-32bit/wrap-asan
> 0x000000600000-0x000000601000 /home/izbyshev/test/gcc/asan-
> exec-from-32bit/wrap-asan
> 0x000000601000-0x000000602000 /home/izbyshev/test/gcc/asan-
> exec-from-32bit/wrap-asan
> 0x0000f7dbd000-0x0000f7de2000 /lib64/ld-2.27.so
> 0x0000f7fe2000-0x0000f7fe3000 /lib64/ld-2.27.so
> 0x0000f7fe3000-0x0000f7fe4000 /lib64/ld-2.27.so
> 0x0000f7fe4000-0x0000f7fe5000
> 0x7fed9abff000-0x7fed9af54000
> 0x7fed9af54000-0x7fed9af6b000 /lib64/libgcc_s.so.1
> [snip]
>
> 2) It doesn't seem to be great for security if an attacker always
> knows
> that ld.so is going to be mapped into the first 4GB in this case
> (the same thing happens for PIEs as well).
>
> The testcase:
> $ cat wrap.c
>
> int main(int argc, char *argv[]) {
> execvp(argv[1], &argv[1]);
> return 127;
> }
>
> $ gcc wrap.c -o wrap
> $ LD_SHOW_AUXV=1 ./wrap ./wrap true |& grep AT_BASE
> AT_BASE: 0x7f63b8309000
> AT_BASE: 0x7faec143c000
> AT_BASE: 0x7fbdb25fa000
>
> $ gcc -m32 wrap.c -o wrap32
> $ LD_SHOW_AUXV=1 ./wrap32 ./wrap true |& grep AT_BASE
> AT_BASE: 0xf7eff000
> AT_BASE: 0xf7cee000
> AT_BASE: 0x7f8b9774e000
>
> Fixes:
> commit 1b028f784e8c ("x86/mm: Introduce mmap_compat_base() for 32-bit
> mmap()")
> commit ada26481dfe6 ("x86/mm: Make in_compat_syscall() work during
> exec")
>
> Cc: Borislav Petkov <bp@xxxxxxx>
> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
> Cc: Dmitry Safonov <0x7f454c46@xxxxxxxxx>
> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: <linux-mm@xxxxxxxxx>
> Cc: <x86@xxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # v4.12+
> Reported-by: Alexey Izbyshev <izbyshev@xxxxxxxxx>
> Bisected-by: Alexander Monakov <amonakov@xxxxxxxxx>
> Investigated-by: Andy Lutomirski <luto@xxxxxxxxxx>
> Signed-off-by: Dmitry Safonov <dima@xxxxxxxxxx>
I've tested it on master with:
- the reproducer
- x86 selftests
- criu
Some selftests are failing, but the same way as before the patch
(ITOW, it's not regression):
[root@localhost self]# grep FAIL out
[FAIL] Reg 1 mismatch: requested 0x0; got 0x3
[FAIL] Reg 15 mismatch: requested 0x8badf00d5aadc0de; got
0xffffff425aadc0de
[FAIL] Reg 15 mismatch: requested 0x8badf00d5aadc0de; got
0xffffff425aadc0de
[FAIL] Reg 15 mismatch: requested 0x8badf00d5aadc0de; got
0xffffff425aadc0de
[FAIL] f[u]comi[p] errors: 1
[FAIL] fisttp errors: 1
[FAIL] R8 has changed:0000000000000000
[FAIL] R9 has changed:0000000000000000
[FAIL] R10 has changed:0000000000000000
[FAIL] R11 has changed:0000000000000000
[FAIL] R8 has changed:0000000000000000
[FAIL] R9 has changed:0000000000000000
[FAIL] R10 has changed:0000000000000000
[FAIL] R11 has changed:0000000000000000
I think, R8-R11 are not preserved yet in master?
Not quite sure about register mismatches :-/
Also ia32-criu has a fail, which I need to look into (but not a
regression).
--
Thanks,
Dmitry
