Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2715620imu; Sat, 10 Nov 2018 22:40:38 -0800 (PST) X-Google-Smtp-Source: AJdET5cF6qW6XzZfGidxDc9RNnvqsra2NVPEFHSYNQeeN1nU3LqRBzDt90kBPv4+zp5toIChmNHV X-Received: by 2002:a17:902:6185:: with SMTP id u5-v6mr15120218plj.41.1541918438466; Sat, 10 Nov 2018 22:40:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541918438; cv=none; d=google.com; s=arc-20160816; b=0vkxATjj/3EUUsCu/XxlWVRBqdE6pC4F94LYJDvi7YdNS5OyxRVsiQds+imI2bqNDX J6qfup8NgQ3OwU3LXQ+l0rYS5SMyidPf60zanO+LUmQDLTh6lUriqOTIS1WHGuGMLSdI zsNimcK1by7kHFlfnV3lvg4Iw2yBK+3XnVSsXrly/UPUkWqOI1HUIekZAC3MlhiW4FSb +k+jOBLOszt5vgsdKahdhKkN9Gc0Tih0KwPsSvLvp819F22hNBMvSs2oUTF2jLtxpsrc 26DPXCkvLpdZZFcdMCLTCa6pxI0FZFGY8xOYIVGGSB+fBgZJpQMR9I9S9fT0BegQSJDp 0G8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=fRcNvSG4XhKN/sLlrUqbuWnPMPiTmRImGtAd4Ro8UT0=; b=KjS6DXOpgsWdblNoT2rnauSSr5RYbHfTnd0C3nG+k4cHSJuE2M8AmnKzxGoU9CsEaw BvsnFKQ1wiSPa6gv6zG5Qgy0TDEUUCHUZKHRJg0fbed18sEOKQYQXPnOSwUjUgxGn9QE NGkGhDBTzCJf/81WF/My6mR6B2HrkXQ3qIQwVevoXTPOiGnOU+ZJYvByI0RMj384ShWo iLsQimMX+OgvLhfICnazE6zr+EPR/Z2x9WE3PymPA8OCkijZGG98IVt6Lu+FIih48Rd7 6jhDaDRVE+SKddU7vUWlU0ZvVj35GDoCLrC3fOql+hCUmV3rrI4560E4FkxS0ypPLNUI inKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b6si6627867pgg.2.2018.11.10.22.40.23; Sat, 10 Nov 2018 22:40:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727632AbeKKQXG (ORCPT + 99 others); Sun, 11 Nov 2018 11:23:06 -0500 Received: from ex13-edg-ou-002.vmware.com ([208.91.0.190]:35773 "EHLO EX13-EDG-OU-002.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727307AbeKKQXF (ORCPT ); Sun, 11 Nov 2018 11:23:05 -0500 Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Sat, 10 Nov 2018 22:35:05 -0800 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 26C5A40454; Sat, 10 Nov 2018 22:35:24 -0800 (PST) From: Nadav Amit To: Ingo Molnar CC: , , "H. Peter Anvin" , Thomas Gleixner , Borislav Petkov , Dave Hansen , Nadav Amit Subject: [PATCH v4 00/10] x86/alternative: text_poke() fixes Date: Sat, 10 Nov 2018 15:17:22 -0800 Message-ID: <20181110231732.15060-1-namit@vmware.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-002.vmware.com: namit@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch-set addresses some issues that might affect the security and the correctness of code patching. The main issue that the patches deal with is the fact that the fixmap PTEs that are used for patching are available for access from other cores and might be exploited. They are not even flushed from the TLB in remote cores, so the risk is even higher. This set addresses this issue by introducing a temporary mm that is only used during patching. Unfortunately, due to init ordering, fixmap is still used during boot-time patching. Future patches can eliminate the need for it. To do so, we need to avoid using text_poke() before the poking-mm is initialized and instead use text_poke_early(). During v3 of this set, Andy & Thomas suggested that early patching of modules can be improved by simply writing to the memory. This actually raises a security concern: there should not be any W+X mappings at any given moment, and modules loading breaks this protection for no good reason. So this patch also addresses this issue, while (presumably) improving patching speed by making module memory initially RW(+NX) and before execution changing it into RO(+X). In addition the patch addresses various issues that are related to code patching, and do some cleanup. I removed in this version some tested-by and reviewed-by tags due to some extensive changes of some patches. v3->v4: - Setting modules as RO when loading [Andy, tglx] - Adding text_poke_kgdb() to keep the text_mutex assertion [tglx] - Simpler logic to decide when to use early-poking [peterZ] - More cleanup v2->v3: - Remove the fallback path in text_poke() [peterZ] - poking_init() was broken due to the local variable poking_addr - Preallocate tables for the temporary-mm to avoid sleep-in-atomic - Prevent KASAN from yelling at text_poke() v1->v2: - Partial revert of 9222f606506c added to 1/6 [masami] - Added Masami's reviewed-by tag RFC->v1: - Added handling of error in get_locked_pte() - Remove lockdep assertion, clarify text_mutex use instead [masami] - Comment fix [peterz] - Removed remainders of text_poke return value [masami] - Use __weak for poking_init instead of macros [masami] - Simplify error handling in poking_init [masami] Andy Lutomirski (1): x86/mm: temporary mm struct Nadav Amit (9): Fix "x86/alternatives: Lockdep-enforce text_mutex in text_poke*()" x86/jump_label: Use text_poke_early() during early init fork: provide a function for copying init_mm x86/alternative: initializing temporary mm for patching x86/alternative: use temporary mm for text poking x86/kgdb: avoid redundant comparison of code x86: avoid W^X being broken during modules loading x86/jump-label: remove support for custom poker x86/alternative: remove the return value of text_poke_*() arch/x86/include/asm/fixmap.h | 2 - arch/x86/include/asm/mmu_context.h | 20 +++ arch/x86/include/asm/pgtable.h | 3 + arch/x86/include/asm/text-patching.h | 9 +- arch/x86/kernel/alternative.c | 208 +++++++++++++++++++++------ arch/x86/kernel/jump_label.c | 24 ++-- arch/x86/kernel/kgdb.c | 19 +-- arch/x86/kernel/module.c | 2 +- arch/x86/mm/init_64.c | 39 +++++ include/linux/filter.h | 6 + include/linux/sched/task.h | 1 + init/main.c | 3 + kernel/fork.c | 24 +++- kernel/module.c | 10 ++ 14 files changed, 289 insertions(+), 81 deletions(-) -- 2.17.1