From patchwork Mon May 21 06:41:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10414019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C90D600CC for ; Mon, 21 May 2018 06:42:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5065628782 for ; Mon, 21 May 2018 06:42:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4447728795; Mon, 21 May 2018 06:42:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C75528782 for ; Mon, 21 May 2018 06:42:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA39F6B0008; Mon, 21 May 2018 02:42:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E531D6B000A; Mon, 21 May 2018 02:42:22 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D42886B000C; Mon, 21 May 2018 02:42:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 921CB6B0008 for ; Mon, 21 May 2018 02:42:22 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id t5-v6so9538566ply.13 for ; Sun, 20 May 2018 23:42:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:to:cc:from:date :message-id:mime-version:content-transfer-encoding; bh=KgHWsQiCrvdcXODTTpMKmvEQLvmPtvQS91qwQ+NxTYE=; b=ddQUxCrddamtTQSDqLKKbSt3GYe5TZmZcpe+5MCNhkK628QMnZNXSqxhLUhNVK/BKA 3u9mftux1ngJoUfkmllcsLX5SJJj8ShW5ZSHVuk3/s6F3/ad3guNizQb4YQhgD/9UjFP 8Nea2B9rM74EANjWWAHOpsA0pqVEbytaSCuPNNqpIiWVsPzkRX4wdTzSeT1EMWGEqZA3 SQ66Os0djZGtYPFv6DxUhhyJP2aHU6a/gBLA0mFETnZx91Rh8XNABpsoyVkFyUmg80T2 okpX0crfpSE9kKe3QJ5/5B3WiLD+hBx8AcXQo7DkKrq6QZMYEGMfww96n0KmCTMRgV3X 8cGA== X-Gm-Message-State: ALKqPwdx8HrGInVMX+zBqN1jf59Cjl5sFqok8/Dil4LQoKgcs61qtm5E zKXSsmnVbo/UjVVH5g/CPrfn5gDi3CPyv+ncixRAdXTb/J57u5Wwdg/B8ERC6h9AdZYeJXPgPJA NL5zstL63MaAttAMRfFi3MRq7XIQav57W/0tYY/MXy6lbra/t3xezb5UqhL/Pmq8= X-Received: by 2002:a63:4384:: with SMTP id q126-v6mr14471698pga.294.1526884942188; Sun, 20 May 2018 23:42:22 -0700 (PDT) X-Google-Smtp-Source: AB8JxZolLIPM0Q02EakqS6qSg9s6Ehet6/G93rxxR58J8/elGb64fW/7X4vi0nTEERbo/0bPM9ME X-Received: by 2002:a63:4384:: with SMTP id q126-v6mr14471669pga.294.1526884941353; Sun, 20 May 2018 23:42:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526884941; cv=none; d=google.com; s=arc-20160816; b=C8h0kDzqQLMpvN3Yfpp06gb2I202BPd3VYsapTUIuGd5X6W+TuSTPJfzY0jk+ZrlmK 1cEiVmdZty3ld+cOQ/Ri5saG7hvdaxkIdvSa8PPWahPw7v3xOSJl4ntb4+bhr6Z1nwXq DPBlQBRCaucHjQXKlzp4zqLp21K9Gcq9mpsiBbL5ivZc724b31/jwQ0V9e1+nZukvqQ/ hPqsAtOyohG1Aud4gjxhx30GZs6f7L3xHIbkjmeykBi6wOYZ2qAkqnSQ7ju0dJBpw9rz uIDy3U0SWkzWKI04kEe8PLDwTX7rTeK7oRn9nmcXMrTTNKRtqKN8wcN3vjAh986kWqBp VAiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:from:cc:to :subject:dkim-signature:arc-authentication-results; bh=KgHWsQiCrvdcXODTTpMKmvEQLvmPtvQS91qwQ+NxTYE=; b=VVzG37P2vabG5VvYICbcl+K/Xjg7P7kKH7RWeBhHR7TwEhPrN+bpxch2rUkAnSCKzH ezC3pTeYCl44Ecxp6Hzdee+YsTDWnfqTJbAreW5KuE/ksHo3pM0H4n3EdST1zydVHYUD RMbVUapXxMivsP5mNzTMdXBLcxAdnAu+fkrix4ywhBjV28ktpc1OlMFJEgm7Q7P/yaNg 1aEp+ZNAh2fAiWkN1N6PRrfaSUTPYHfQZevIvAVow+5zJgtnH917v3iEdVIH3ii0CFYe pItuvafXymLc/55ZyrfH0q3c9in/b0wZ30Ij5WMKqMGe7lJIgeQbml+nelWefLwbZ5+i mbSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Gozcirzd; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id a123-v6si10602656pgc.597.2018.05.20.23.42.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 23:42:21 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Gozcirzd; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BE2520870; Mon, 21 May 2018 06:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1526884941; bh=/TV8FtjZg6z3QQlbSDNCUmug/uLuUa+9ocrbrCXgMdM=; h=Subject:To:Cc:From:Date:From; b=Gozcirzdr1rzjnxosWJdvnI3pZvjwEEDevEf/4aIRfpmc8z5G6GI1MVRxEytrqToo ujyyyvxLByFB7cRDNCLfdt5yHShuFq4+45joPRtRtPF63sX8dPkEu6oB7sR93uBdiU AwLcuR7bVdfbqI8NqlmmEkyAfPBObRU4WvFVDEtY= Subject: Patch "x86/mm: Drop TS_COMPAT on 64-bit exec() syscall" has been added to the 4.14-stable tree To: 0x7f454c46@gmail.com, 20180517233510.24996-1-dima@arista.com, amonakov@ispras.ru, bp@suse.de, dima@arista.com, gorcunov@openvz.org, gregkh@linuxfoundation.org, hpa@zytor.com, izbyshev@ispras.ru, kirill.shutemov@linux.intel.com, linux-mm@kvack.org, luto@kernel.org, tglx@linutronix.de Cc: From: Date: Mon, 21 May 2018 08:41:28 +0200 Message-ID: <15268848885988@kroah.com> MIME-Version: 1.0 X-stable: commit 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: X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I've just added the patch titled x86/mm: Drop TS_COMPAT on 64-bit exec() syscall to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-mm-drop-ts_compat-on-64-bit-exec-syscall.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From acf46020012ccbca1172e9c7aeab399c950d9212 Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Fri, 18 May 2018 00:35:10 +0100 Subject: x86/mm: Drop TS_COMPAT on 64-bit exec() syscall From: Dmitry Safonov commit acf46020012ccbca1172e9c7aeab399c950d9212 upstream. 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: 1b028f784e8c ("x86/mm: Introduce mmap_compat_base() for 32-bit mmap()") Fixes: ada26481dfe6 ("x86/mm: Make in_compat_syscall() work during exec") Reported-by: Alexey Izbyshev Bisected-by: Alexander Monakov Investigated-by: Andy Lutomirski Signed-off-by: Dmitry Safonov Signed-off-by: Thomas Gleixner Reviewed-by: Cyrill Gorcunov Cc: Borislav Petkov Cc: Alexander Monakov Cc: Dmitry Safonov <0x7f454c46@gmail.com> Cc: stable@vger.kernel.org Cc: linux-mm@kvack.org Cc: Andy Lutomirski Cc: "H. Peter Anvin" Cc: Cyrill Gorcunov Cc: "Kirill A. Shutemov" Link: https://lkml.kernel.org/r/20180517233510.24996-1-dima@arista.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/process_64.c | 1 + 1 file changed, 1 insertion(+) Patches currently in stable-queue which might be from dima@arista.com are queue-4.14/x86-mm-drop-ts_compat-on-64-bit-exec-syscall.patch --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -528,6 +528,7 @@ void set_personality_64bit(void) clear_thread_flag(TIF_X32); /* Pretend that this comes from a 64bit execve */ task_pt_regs(current)->orig_ax = __NR_execve; + current_thread_info()->status &= ~TS_COMPAT; /* Ensure the corresponding mm is not marked. */ if (current->mm)