From patchwork Wed Aug 15 20:30:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 10566805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18935921 for ; Wed, 15 Aug 2018 20:34:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD7B02ACA9 for ; Wed, 15 Aug 2018 20:34:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B191E2AD66; Wed, 15 Aug 2018 20:34:32 +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,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 0BCC92ACA9 for ; Wed, 15 Aug 2018 20:34:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02EB06B0270; Wed, 15 Aug 2018 16:34:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F20FC6B0271; Wed, 15 Aug 2018 16:34: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 DE6D56B0272; Wed, 15 Aug 2018 16:34:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 96CDA6B0271 for ; Wed, 15 Aug 2018 16:34:22 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id e15-v6so1024503pfi.5 for ; Wed, 15 Aug 2018 13:34:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=BEXcMjnNTOXJwbPz65J095Omuwtk8/8Za5oTyTpcKxk=; b=PeBzfVF62a6vvHknH2rFWMSFMomyvGNz7XzZAQcCsazySa9IcIVJULqUorcny6YAoQ T7lRgJEMo1tNswMqiZYJC1JyWd/3KNTM1uCaMiyro59GpJSG3QfG5477z7xFyR9TJqxE m7fSUHYWmeUC303BVLcFW01O5FoCzsPPQArn+uoM5EthRjmZ+zQe+qn4h2nRwsZfeE8M s4lq67vvAx4lJRpxJ8FKbDIQZQNmG93WrWiXkClESoeh1hXGZgpFEt4/DJivXa2bkBqO 8ThDcejvzNpq14ruMN9VmH6siUtphxCN1xB/sWhE5Xz2GM5GMPIMlTYKISlFM7Zjq5tc fiSQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AOUpUlHbG13WzgUXGj9b3jIL+/j+2E89jY/QDv4H/hK8GhEERv1axoaZ y7ATLQxh4Afjud+N70HYWWfENE458jUBZBEaYpVMCJV4kb5XICcV/oIWuHDw0tOffwkS4uq66/Q e5JWVyJWsLASncU86XK//n2RShh+lDEitOzxxjhhpYF5ql8AkdM5rB6M4Hq7+WGsg5g== X-Received: by 2002:a65:58c8:: with SMTP id e8-v6mr11230992pgu.96.1534365262221; Wed, 15 Aug 2018 13:34:22 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxdjihzvUaYhNWl+1TmXDac0N/txS3f/ZSFRgTDAdyvPOhbmYAd6sBwSVPL6Jn6WilWLMiu X-Received: by 2002:a65:58c8:: with SMTP id e8-v6mr11230936pgu.96.1534365261041; Wed, 15 Aug 2018 13:34:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534365261; cv=none; d=google.com; s=arc-20160816; b=GcQYHcrK2jahnfwa9vuzz9KLue1OafkJSR/q/LIob3HeA3ewuTvMTvH7Wz7MvFmdRp khq+ActluM1KU1yoJL67ZX0OjqNyEUNGtBSB2Bol4o8c4rbBxg/wuBMACpgIO6KMZUnN 45WOo4v47vc6hBElBdpg56q4FhaLuyDcztb3+Tb/nsYBvb2cOQ04GJKGKUaWEnO0G2Vb UgqUyLnVRepKIggdLI2x8vRlUfABr+AKHuCLKj7nU7hfLgm/sdkInvT7BU2DLMdoSe85 A7KjxTO9Ik+A6LTAL+6m61Hif9aoIqfHK06hkAnkSUe21jcKSR2fgermG/qzt+DEYUZR 1vnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=BEXcMjnNTOXJwbPz65J095Omuwtk8/8Za5oTyTpcKxk=; b=yTbehS7RzScA0hOk8dbWNjz4/1EFP3PuIJPXcVygMi70Laa4ZPci3StGBg1YrLFakT 4OMO+NsA0Rs3b/+i+Xj1HQnrCbsNBC6iQ0PmfGQ6rlStTnGNyCCamZWa4VYdVakLOyYY 0NZtXx1qtEQu0vPSSXbp5amxTSlQTVyH7ZqlXF6+g6AG4BQ/rIqqxv7Lrzyo4ewM8g2T iYDZlHH2K693hBueob4qBeiRLHmlzEQLp/LRgnarF7skJ5KTLs4y/ggJd2zyU/E607hP DF+3Dzn3xm1YQ3J98dcs/tlp62j6CAptGZXOzvxq7TigNxa5M89c/aEBSl38WnNIP+lr H7eg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id n3-v6si18917408pld.146.2018.08.15.13.34.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:34:21 -0700 (PDT) Received-SPF: pass (google.com: domain of rick.p.edgecombe@intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2018 13:34:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,244,1531810800"; d="scan'208";a="224930396" Received: from rpedgeco-hp-z240-tower-workstation.jf.intel.com (HELO rpedgeco-DESK5.jf.intel.com) ([10.54.75.168]) by orsmga004.jf.intel.com with ESMTP; 15 Aug 2018 13:34:18 -0700 From: Rick Edgecombe To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com, daniel@iogearbox.net, jannh@google.com, keescook@chromium.org Cc: kristen@linux.intel.com, dave.hansen@intel.com, arjan@linux.intel.com, Rick Edgecombe Subject: [PATCH v3 2/3] x86/modules: Increase randomization for modules Date: Wed, 15 Aug 2018 13:30:18 -0700 Message-Id: <1534365020-18943-3-git-send-email-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534365020-18943-1-git-send-email-rick.p.edgecombe@intel.com> References: <1534365020-18943-1-git-send-email-rick.p.edgecombe@intel.com> 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 changes the behavior of the KASLR logic for allocating memory for the text sections of loadable modules. It randomizes the location of each module text section with about 17 bits of entropy in typical use. This is enabled on X86_64 only. For 32 bit, the behavior is unchanged. It refactors existing code around module randomization in order to cleanly implement this along side the unchanged 32 bit behavior. The algorithm breaks the module space in two, a random area and a backup area. It first tries to allocate at a number of randomly located starting pages inside the random section without purging any lazy free vmap areas and triggering the associated TLB flush. If this fails, it will try again a number of times allowing for purges if needed. Finally if those both fail to find a position it will allocate in the backup area. The backup area base will be offset in the same way as the current algorithm does for the base area, 1024 possible locations. Signed-off-by: Rick Edgecombe --- arch/x86/include/asm/pgtable_64_types.h | 7 ++ arch/x86/kernel/module.c | 163 +++++++++++++++++++++++++++----- 2 files changed, 147 insertions(+), 23 deletions(-) diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h index 054765a..c320b7f 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -142,6 +142,13 @@ extern unsigned int ptrs_per_p4d; #define MODULES_END _AC(0xffffffffff000000, UL) #define MODULES_LEN (MODULES_END - MODULES_VADDR) +/* + * Dedicate the first part of the module space to a randomized area when KASLR + * is in use. Leave the remaining part for a fallback if we are unable to + * allocate in the random area. + */ +#define MODULES_RAND_LEN PAGE_ALIGN((MODULES_LEN/3)*2) + #define ESPFIX_PGD_ENTRY _AC(-2, UL) #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << P4D_SHIFT) diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index f58336a..1cb8efa 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -48,34 +48,149 @@ do { \ } while (0) #endif -#ifdef CONFIG_RANDOMIZE_BASE +static inline int kaslr_randomize_each_module(void) +{ + return kaslr_enabled() + && IS_ENABLED(CONFIG_RANDOMIZE_BASE) + && IS_ENABLED(CONFIG_X86_64); +} + +static inline int kaslr_randomize_base(void) +{ + return kaslr_enabled() + && IS_ENABLED(CONFIG_RANDOMIZE_BASE) + && !IS_ENABLED(CONFIG_X86_64); +} + +#ifdef CONFIG_X86_64 +static inline const unsigned long get_modules_rand_len(void) +{ + return MODULES_RAND_LEN; +} +#else +static inline const unsigned long get_modules_rand_len(void) +{ + BUILD_BUG(); + return 0; +} +#endif + static unsigned long module_load_offset; +static const unsigned long NR_NO_PURGE = 5000; +static const unsigned long NR_TRY_PURGE = 5000; /* Mutex protects the module_load_offset. */ static DEFINE_MUTEX(module_kaslr_mutex); static unsigned long int get_module_load_offset(void) { - if (kaslr_enabled()) { - mutex_lock(&module_kaslr_mutex); - /* - * Calculate the module_load_offset the first time this - * code is called. Once calculated it stays the same until - * reboot. - */ - if (module_load_offset == 0) - module_load_offset = - (get_random_int() % 1024 + 1) * PAGE_SIZE; - mutex_unlock(&module_kaslr_mutex); - } + mutex_lock(&module_kaslr_mutex); + /* + * Calculate the module_load_offset the first time this + * code is called. Once calculated it stays the same until + * reboot. + */ + if (module_load_offset == 0) + module_load_offset = (get_random_int() % 1024 + 1) * PAGE_SIZE; + mutex_unlock(&module_kaslr_mutex); + return module_load_offset; } -#else -static unsigned long int get_module_load_offset(void) + +static unsigned long get_module_vmalloc_start(void) { - return 0; + if (kaslr_randomize_each_module()) + return MODULES_VADDR + get_modules_rand_len() + + get_module_load_offset(); + else if (kaslr_randomize_base()) + return MODULES_VADDR + get_module_load_offset(); + + return MODULES_VADDR; +} + +static void *try_module_alloc(unsigned long addr, unsigned long size, + int try_purge) +{ + const unsigned long vm_flags = 0; + + return __vmalloc_node_try_addr(addr, size, GFP_KERNEL, PAGE_KERNEL_EXEC, + vm_flags, NUMA_NO_NODE, try_purge, + __builtin_return_address(0)); +} + +/* + * Find a random address to try that wont obviosly not fit. Random areas are + * allowed to overflow into the backup area + */ +static unsigned long get_rand_module_addr(unsigned long size) +{ + unsigned long nr_max_pos = (MODULES_LEN - size) / MODULE_ALIGN + 1; + unsigned long nr_rnd_pos = get_modules_rand_len() / MODULE_ALIGN; + unsigned long nr_pos = min(nr_max_pos, nr_rnd_pos); + + unsigned long module_position_nr = get_random_long() % nr_pos; + unsigned long offset = module_position_nr * MODULE_ALIGN; + + return MODULES_VADDR + offset; +} + +/* + * Try to allocate in the random area. First 5000 times without purging, then + * 5000 times with purging. If these fail, return NULL. + */ +static void *try_module_randomize_each(unsigned long size) +{ + void *p = NULL; + unsigned int i; + unsigned long last_lazy_free_blocked = 0; + + /* This will have a gaurd page */ + unsigned long real_size = PAGE_ALIGN(size) + PAGE_SIZE; + + if (!kaslr_randomize_each_module()) + return NULL; + + /* Make sure there is at least one address that might fit. */ + if (real_size < PAGE_ALIGN(size) || real_size > MODULES_LEN) + return NULL; + + /* Try to find a spot that doesn't need a lazy purge */ + for (i = 0; i < NR_NO_PURGE; i++) { + unsigned long addr = get_rand_module_addr(real_size); + + /* First try to avoid having to purge */ + p = try_module_alloc(addr, real_size, 0); + + /* + * Save the last value that was blocked by a + * lazy purge area. + */ + if (IS_ERR(p) && PTR_ERR(p) == -EUCLEAN) + last_lazy_free_blocked = addr; + else if (!IS_ERR(p)) + return p; + } + + /* Try the most recent spot that could be used after a lazy purge */ + if (last_lazy_free_blocked) { + p = try_module_alloc(last_lazy_free_blocked, real_size, 1); + + if (!IS_ERR(p)) + return p; + } + + /* Look for more spots and allow lazy purges */ + for (i = 0; i < NR_TRY_PURGE; i++) { + unsigned long addr = get_rand_module_addr(real_size); + + /* Give up and allow for purges */ + p = try_module_alloc(addr, real_size, 1); + + if (!IS_ERR(p)) + return p; + } + return NULL; } -#endif void *module_alloc(unsigned long size) { @@ -84,16 +199,18 @@ void *module_alloc(unsigned long size) if (PAGE_ALIGN(size) > MODULES_LEN) return NULL; - p = __vmalloc_node_range(size, MODULE_ALIGN, - MODULES_VADDR + get_module_load_offset(), - MODULES_END, GFP_KERNEL, - PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, - __builtin_return_address(0)); + p = try_module_randomize_each(size); + + if (!p) + p = __vmalloc_node_range(size, MODULE_ALIGN, + get_module_vmalloc_start(), MODULES_END, + GFP_KERNEL, PAGE_KERNEL_EXEC, 0, + NUMA_NO_NODE, __builtin_return_address(0)); + if (p && (kasan_module_alloc(p, size) < 0)) { vfree(p); return NULL; } - return p; }