From patchwork Fri Apr 26 00:11:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 10918561 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 4C94592A for ; Fri, 26 Apr 2019 07:32:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BC8C28DA3 for ; Fri, 26 Apr 2019 07:32:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FA4B28DA6; Fri, 26 Apr 2019 07:32:14 +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=-1.4 required=2.0 tests=BAYES_00,DATE_IN_PAST_06_12, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=no 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 9C08528DA3 for ; Fri, 26 Apr 2019 07:32:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D03C86B026B; Fri, 26 Apr 2019 03:31:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C4FB56B026A; Fri, 26 Apr 2019 03:31:49 -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 85FCE6B026E; Fri, 26 Apr 2019 03:31:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id D2B566B0010 for ; Fri, 26 Apr 2019 03:31:48 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id z7so1526531pgc.1 for ; Fri, 26 Apr 2019 00:31:48 -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:mime-version; bh=n/B3+n3f5xXPTebK3I1nT05hBod2ytL0DtnQ9iVLEbk=; b=bKN5d+IFg0nIRjryPbcikns5iRjBGXZAImSfB3CtK/1gG5gIowJvq518vxEvOWQ/tH 1Xbqxzwcb4PvntOTptzcAyYbD0EWNEOrmkUJIFM2qApXv7UJdtW+w0eHHWyt4IIgaPhC h7baicCZU9Hx4fBjurLfz/8b7dd/6KhE+HGRf0zXdDTgdqg+z154/ZCQU5CHjv58Y3Y9 NcqRse5xeF1UpF4p7dwjmP0SbV5SJBN1xDwdCJObjAUUaTo5SMiuLKHVll73IGsYujbx crXpDIyz8/89AypdJ/K/35fXc6whPn7yWd9WFTwBaAi1X01wyWq30Nvb8ABfp/cLXhOA 1+hw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of namit@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=namit@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAXiC/mmmtvaZK14zCwBlWaSOHyYTxr/aOSbQXOzlp9AMxWqL9oM VONQ3jg3Tg6se2ppH9HfIAqsWFApswdP3OuHe4V/NQ176V/wA1Z+ShEMRmcMIE/31wXTJh6QRCp KCNsc6vNowFqFAf60n6KAnPrTXuS60LvajIv95f9ENfcQ6TfFl2Z7pry2Z1whfwQ2dw== X-Received: by 2002:a62:1c87:: with SMTP id c129mr20611441pfc.113.1556263908314; Fri, 26 Apr 2019 00:31:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqy6ewiujwcoLTCfMrT68M6wGAt72XmDo0iew7rIeeELWOI8LK2GigqHCTmDco6HGCqrKIga X-Received: by 2002:a62:1c87:: with SMTP id c129mr20611339pfc.113.1556263906881; Fri, 26 Apr 2019 00:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556263906; cv=none; d=google.com; s=arc-20160816; b=LXd0VlzG8bQ5O+BLzGKX2l/DzDqlcwEI34mdMMbwUb8hd8sNDcrYr8l+ergr303UF4 Q6yKSitGvVstyjm8WX0pbdWqAYjZ79Yazn8EYk55nMTm/jQ+1Zi0bVgVvivsNI9htU7r ogY+JOnomGPzZcBsPDaQufhUY4UdtEKHVv1gzAREBM1bYQ6KFFnc/rSpqZdxoEi1JZgN EZ8eo3F7NJw+worhwAKlBxpfSJ0XFnpcEVgLE3lNCZry5k/PzCGhjPdECO3SeMxxTTTP bCJP4gtlBJ+v8Dvj2o2cKCMaxKp19fzr7dnC5UE74C1KyUIh83VC6zgIcEzEKKC3IdSb 7Dbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=n/B3+n3f5xXPTebK3I1nT05hBod2ytL0DtnQ9iVLEbk=; b=f3VSrroOqoE+2xZ0MFXNo52mS5hzz+AMZxkHEDlnPVNPbn2i1slRTakXEfTod2K9uW 10vVjgytxAs6qhhfEFD09A01w4GVY0JC5K/6xXdCE9qLu21t/UNkA7MyZ52FTJUA4jQg Qa4VHnKjCjvPH2Q+Juygzr+iFkKF5t7XUUYmX8g4hy63UNHynUVJg5iolTfEjn43s5lk r4RKBwbZUYy2ZbVDNrBNTZ8lCzQtyOG/HaEQyF7qszoc1SNWimxUD9YMgAafcIWYz+dt p1Q4YC0UpdlJYoAFAG81N6sG1Z3zhBJbmtPM3ENz6X76sGn9STeET4DOkc88qYktlc1E NyOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of namit@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=namit@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com. [208.91.0.189]) by mx.google.com with ESMTPS id v82si25417769pfa.42.2019.04.26.00.31.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Apr 2019 00:31:46 -0700 (PDT) Received-SPF: pass (google.com: domain of namit@vmware.com designates 208.91.0.189 as permitted sender) client-ip=208.91.0.189; Authentication-Results: mx.google.com; spf=pass (google.com: domain of namit@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=namit@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Fri, 26 Apr 2019 00:31:40 -0700 Received: from sc2-haas01-esx0118.eng.vmware.com (sc2-haas01-esx0118.eng.vmware.com [10.172.44.118]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id BC4EC412A4; Fri, 26 Apr 2019 00:31:45 -0700 (PDT) From: Nadav Amit To: Peter Zijlstra , Borislav Petkov , Andy Lutomirski , Ingo Molnar CC: , , , Thomas Gleixner , Nadav Amit , Dave Hansen , , , , , , , , , , , Rick Edgecombe , Nadav Amit , Kees Cook , Dave Hansen , Masami Hiramatsu , Jessica Yu Subject: [PATCH v5 11/23] x86/module: Avoid breaking W^X while loading modules Date: Thu, 25 Apr 2019 17:11:31 -0700 Message-ID: <20190426001143.4983-12-namit@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190426001143.4983-1-namit@vmware.com> References: <20190426001143.4983-1-namit@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: namit@vmware.com does not designate permitted sender hosts) 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 When modules and BPF filters are loaded, there is a time window in which some memory is both writable and executable. An attacker that has already found another vulnerability (e.g., a dangling pointer) might be able to exploit this behavior to overwrite kernel code. Prevent having writable executable PTEs in this stage. In addition, avoiding having W+X mappings can also slightly simplify the patching of modules code on initialization (e.g., by alternatives and static-key), as would be done in the next patch. This was actually the main motivation for this patch. To avoid having W+X mappings, set them initially as RW (NX) and after they are set as RO set them as X as well. Setting them as executable is done as a separate step to avoid one core in which the old PTE is cached (hence writable), and another which sees the updated PTE (executable), which would break the W^X protection. Cc: Kees Cook Cc: Peter Zijlstra Cc: Dave Hansen Cc: Masami Hiramatsu Cc: Jessica Yu Suggested-by: Thomas Gleixner Suggested-by: Andy Lutomirski Signed-off-by: Nadav Amit Signed-off-by: Rick Edgecombe --- arch/x86/kernel/alternative.c | 28 +++++++++++++++++++++------- arch/x86/kernel/module.c | 2 +- include/linux/filter.h | 1 + kernel/module.c | 5 +++++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 599203876c32..3d2b6b6fb20c 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -668,15 +668,29 @@ void __init alternative_instructions(void) * handlers seeing an inconsistent instruction while you patch. */ void *__init_or_module text_poke_early(void *addr, const void *opcode, - size_t len) + size_t len) { unsigned long flags; - local_irq_save(flags); - memcpy(addr, opcode, len); - local_irq_restore(flags); - sync_core(); - /* Could also do a CLFLUSH here to speed up CPU recovery; but - that causes hangs on some VIA CPUs. */ + + if (boot_cpu_has(X86_FEATURE_NX) && + is_module_text_address((unsigned long)addr)) { + /* + * Modules text is marked initially as non-executable, so the + * code cannot be running and speculative code-fetches are + * prevented. Just change the code. + */ + memcpy(addr, opcode, len); + } else { + local_irq_save(flags); + memcpy(addr, opcode, len); + local_irq_restore(flags); + sync_core(); + + /* + * Could also do a CLFLUSH here to speed up CPU recovery; but + * that causes hangs on some VIA CPUs. + */ + } return addr; } diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index b052e883dd8c..cfa3106faee4 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -87,7 +87,7 @@ void *module_alloc(unsigned long size) p = __vmalloc_node_range(size, MODULE_ALIGN, MODULES_VADDR + get_module_load_offset(), MODULES_END, GFP_KERNEL, - PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, + PAGE_KERNEL, 0, NUMA_NO_NODE, __builtin_return_address(0)); if (p && (kasan_module_alloc(p, size) < 0)) { vfree(p); diff --git a/include/linux/filter.h b/include/linux/filter.h index 6074aa064b54..14ec3bdad9a9 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -746,6 +746,7 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr) { set_memory_ro((unsigned long)hdr, hdr->pages); + set_memory_x((unsigned long)hdr, hdr->pages); } static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr) diff --git a/kernel/module.c b/kernel/module.c index 0b9aa8ab89f0..2b2845ae983e 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1950,8 +1950,13 @@ void module_enable_ro(const struct module *mod, bool after_init) return; frob_text(&mod->core_layout, set_memory_ro); + frob_text(&mod->core_layout, set_memory_x); + frob_rodata(&mod->core_layout, set_memory_ro); + frob_text(&mod->init_layout, set_memory_ro); + frob_text(&mod->init_layout, set_memory_x); + frob_rodata(&mod->init_layout, set_memory_ro); if (after_init)