From patchwork Thu Oct 8 16:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Topi Miettinen X-Patchwork-Id: 11824221 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C60813B2 for ; Thu, 8 Oct 2020 16:54:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 38C10221FF for ; Thu, 8 Oct 2020 16:54:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r1nkHaQJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38C10221FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 22D2A6B005C; Thu, 8 Oct 2020 12:54:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1DCB96B005D; Thu, 8 Oct 2020 12:54:28 -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 0CBDD6B0062; Thu, 8 Oct 2020 12:54:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0168.hostedemail.com [216.40.44.168]) by kanga.kvack.org (Postfix) with ESMTP id D1E9C6B005C for ; Thu, 8 Oct 2020 12:54:27 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5AE5D1EE6 for ; Thu, 8 Oct 2020 16:54:27 +0000 (UTC) X-FDA: 77349356574.23.root94_2208932271d9 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 3386A37608 for ; Thu, 8 Oct 2020 16:54:27 +0000 (UTC) X-Spam-Summary: 1,0,0,49a17603c5064351,d41d8cd98f00b204,toiwoton@gmail.com,,RULES_HIT:1:2:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1431:1437:1515:1605:1730:1747:1777:1792:1801:2194:2198:2199:2200:2393:2526:2553:2559:2562:2693:2731:2903:2915:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:3874:4050:4250:4321:4605:5007:6117:6119:6238:6261:6653:7514:7903:7904:7974:9010:9040:9413:10004:11026:11232:11473:11658:11914:12043:12048:12291:12296:12297:12438:12517:12519:12555:12683:12895:12986:13146:13161:13229:13230:13894:14096:14394:14687:21080:21325:21444:21451:21627:21666:21795:21966:21990:30003:30051:30054:30069:30090,0,RBL:209.85.208.193:@gmail.com:.lbl8.mailshell.net-62.18.84.100 66.100.201.100;04yfgj9xdmzzmcsz4dumbonrwmsw8opwwch6rcmjpg87kencrkzufzdi83cecip.z69duerypq9o8thgb4u8fjg1ak9dpc7iz9h1gixtjfwzmcbcthcegkxtgiw6iqp.e-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutr al,Custo X-HE-Tag: root94_2208932271d9 X-Filterd-Recvd-Size: 10443 Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Thu, 8 Oct 2020 16:54:26 +0000 (UTC) Received: by mail-lj1-f193.google.com with SMTP id a5so6493289ljj.11 for ; Thu, 08 Oct 2020 09:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HaQHMvsAbN6cMevstK9X71pYZ6JlF0DetbVYPC1lGLA=; b=r1nkHaQJuFcB7uC4ho7uvig5jKozNzmLY8hyJcWgAqiCly9Ohab7JX4Fbddic9IG59 x/64aKJUvf/0hYw3P0VsU6Ml9HodFc3amIR5CSJydo1CsdonBkpCNMMEkcYjuEGXNzWY PQ7SK8rYD7QDhzs63eLdw2l/STVfh4zvmMVL1q4DwTvYExs7lPIW432kFcs9eO/9qVH3 NErhyMwSYVQn7AfNRYly4oWJpg1lGc50uWjGkOT/YBo/7s0c/9tXAwGTJyzIxVEVCWdV oC47WeX3pR0huCP7BWR8SG5iYpvxwhmEOyqI2bLHZMkAdjIELnyooXJdLif2GKtaK5Rw tfsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HaQHMvsAbN6cMevstK9X71pYZ6JlF0DetbVYPC1lGLA=; b=V9B3oi7BLvKX1ByU1R2GqdAVvXxOnPb8bk73TF0ddLx5k3g3+yQrVXpflGuhoAp8FJ rlmMX/xyrZLYmZT8WtaezqZLek9JAdctWxicAfUvfeOdDd7JQ1QJfDohg7gj4eq4S08X aKTihU7FoDb6UvGJKpOEJ/qE1va5n422PkvKHEhuZfJUaOY5cUXQJ6GaiyuASBKUDx1g 5MGlUMQ8/4/RGp9/n+VFQrPEVto07y+0Hn1uL6GzGyJx5eRtccs/U0UNsBWioHvlDPSP p9Hh7yvBprmXjEtXwL+Y5xt6UjYrROz825+geH7HfgZgjTI1eUwVKgKn+hby4RKhZMum 1mGg== X-Gm-Message-State: AOAM531QUbK6Sho8FYFerA7h6rB4nGX/hVy34kcYX2gz0J44VOwlsPZU qrNZs8qbcDHHDslD/3iX0GE= X-Google-Smtp-Source: ABdhPJz/plXwTht2xCVVQp/qk4FJe1rVnLu6QowNVc/WjIKj3Dn3u+OmqIlQ0ESGqRpySz7e2Oyeiw== X-Received: by 2002:a2e:9817:: with SMTP id a23mr3341223ljj.280.1602176064914; Thu, 08 Oct 2020 09:54:24 -0700 (PDT) Received: from localhost.localdomain (88-114-211-119.elisa-laajakaista.fi. [88.114.211.119]) by smtp.gmail.com with ESMTPSA id o15sm946696lfg.226.2020.10.08.09.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 09:54:24 -0700 (PDT) From: Topi Miettinen To: linux-hardening@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Topi Miettinen Subject: [PATCH RESEND v2] mm: Optional full ASLR for mmap() and mremap() Date: Thu, 8 Oct 2020 19:54:08 +0300 Message-Id: <20201008165408.38228-1-toiwoton@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 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: Writing a new value of 3 to /proc/sys/kernel/randomize_va_space enables full randomization of memory mappings created with mmap(NULL, ...). With 2, the base of the VMA used for such mappings is random, but the mappings are created in predictable places within the VMA and in sequential order. With 3, new VMAs are created to fully randomize the mappings. Also mremap(..., MREMAP_MAYMOVE) will move the mappings even if not necessary. On 32 bit systems this may cause problems due to increased VM fragmentation if the address space gets crowded. In this example, with value of 2, ld.so.cache, libc, an anonymous mmap and locale-archive are located close to each other: $ strace /bin/sync ... openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=189096, ...}) = 0 mmap(NULL, 189096, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7d9c1e7f2000 ... openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0n\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1839792, ...}) = 0 mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7d9c1e7f0000 mmap(NULL, 1852680, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7d9c1e62b000 ... openat(AT_FDCWD, "/usr/lib/locale/locale-archive", O_RDONLY|O_CLOEXEC) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=5642592, ...}) = 0 mmap(NULL, 5642592, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7d9c1e0c9000 With 3, they are located in unrelated addresses: $ echo 3 > /proc/sys/kernel/randomize_va_space $ /bin/sync ... openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=189096, ...}) = 0 mmap(NULL, 189096, PROT_READ, MAP_PRIVATE, 3, 0) = 0xeda4fbea000 ... openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0n\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1839792, ...}) = 0 mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb8fb9c1d000 mmap(NULL, 1852680, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xaabd8598000 ... openat(AT_FDCWD, "/usr/lib/locale/locale-archive", O_RDONLY|O_CLOEXEC) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=5642592, ...}) = 0 mmap(NULL, 5642592, PROT_READ, MAP_PRIVATE, 3, 0) = 0xbe351ab8000 Signed-off-by: Topi Miettinen --- Resent also to hardening list (hopefully the right one) v2: also randomize mremap(..., MREMAP_MAYMOVE) --- Documentation/admin-guide/hw-vuln/spectre.rst | 6 +++--- Documentation/admin-guide/sysctl/kernel.rst | 11 +++++++++++ init/Kconfig | 2 +- mm/mmap.c | 7 ++++++- mm/mremap.c | 15 +++++++++++++++ 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/Documentation/admin-guide/hw-vuln/spectre.rst b/Documentation/admin-guide/hw-vuln/spectre.rst index e05e581af5cf..9ea250522077 100644 --- a/Documentation/admin-guide/hw-vuln/spectre.rst +++ b/Documentation/admin-guide/hw-vuln/spectre.rst @@ -254,7 +254,7 @@ Spectre variant 2 left by the previous process will also be cleared. User programs should use address space randomization to make attacks - more difficult (Set /proc/sys/kernel/randomize_va_space = 1 or 2). + more difficult (Set /proc/sys/kernel/randomize_va_space = 1, 2 or 3). 3. A virtualized guest attacking the host ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -499,8 +499,8 @@ Spectre variant 2 more overhead and run slower. User programs should use address space randomization - (/proc/sys/kernel/randomize_va_space = 1 or 2) to make attacks more - difficult. + (/proc/sys/kernel/randomize_va_space = 1, 2 or 3) to make attacks + more difficult. 3. VM mitigation ^^^^^^^^^^^^^^^^ diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst index d4b32cc32bb7..acd0612155d9 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -1060,6 +1060,17 @@ that support this feature. Systems with ancient and/or broken binaries should be configured with ``CONFIG_COMPAT_BRK`` enabled, which excludes the heap from process address space randomization. + +3 Additionally enable full randomization of memory mappings created + with mmap(NULL, ...). With 2, the base of the VMA used for such + mappings is random, but the mappings are created in predictable + places within the VMA and in sequential order. With 3, new VMAs + are created to fully randomize the mappings. Also mremap(..., + MREMAP_MAYMOVE) will move the mappings even if not necessary. + + On 32 bit systems this may cause problems due to increased VM + fragmentation if the address space gets crowded. + == =========================================================================== diff --git a/init/Kconfig b/init/Kconfig index d6a0b31b13dc..c5ea2e694f6a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1859,7 +1859,7 @@ config COMPAT_BRK also breaks ancient binaries (including anything libc5 based). This option changes the bootup default to heap randomization disabled, and can be overridden at runtime by setting - /proc/sys/kernel/randomize_va_space to 2. + /proc/sys/kernel/randomize_va_space to 2 or 3. On non-ancient distros (post-2000 ones) N is usually a safe choice. diff --git a/mm/mmap.c b/mm/mmap.c index 40248d84ad5f..489368f43af1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -206,7 +207,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) #ifdef CONFIG_COMPAT_BRK /* * CONFIG_COMPAT_BRK can still be overridden by setting - * randomize_va_space to 2, which will still cause mm->start_brk + * randomize_va_space to >= 2, which will still cause mm->start_brk * to be arbitrarily shifted */ if (current->brk_randomized) @@ -1407,6 +1408,10 @@ unsigned long do_mmap(struct file *file, unsigned long addr, if (mm->map_count > sysctl_max_map_count) return -ENOMEM; + /* Pick a random address even outside current VMAs? */ + if (!addr && randomize_va_space >= 3) + addr = arch_mmap_rnd(); + /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ diff --git a/mm/mremap.c b/mm/mremap.c index 138abbae4f75..c7fd1ab5fb5f 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -720,6 +721,20 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, goto out; } + if ((flags & MREMAP_MAYMOVE) && randomize_va_space >= 3) { + /* + * Caller is happy with a different address, so let's + * move even if not necessary! + */ + new_addr = arch_mmap_rnd(); + + ret = mremap_to(addr, old_len, new_addr, new_len, + &locked, flags, &uf, &uf_unmap_early, + &uf_unmap); + goto out; + } + + /* * Always allow a shrinking remap: that just unmaps * the unnecessary pages..