From patchwork Sun May 27 15:59:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10429491 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 A9017602CC for ; Sun, 27 May 2018 16:21:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8183428B78 for ; Sun, 27 May 2018 16:21:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73D9B28BC0; Sun, 27 May 2018 16:21:38 +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 96EF728B78 for ; Sun, 27 May 2018 16:21:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1AD46B0003; Sun, 27 May 2018 12:21:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CCA0A6B0006; Sun, 27 May 2018 12:21:35 -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 B92056B0007; Sun, 27 May 2018 12:21:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 709286B0003 for ; Sun, 27 May 2018 12:21:35 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id f10-v6so6161454pln.21 for ; Sun, 27 May 2018 09:21:35 -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=vqdUWKq8lLjkrpZAPUvrfmYwrvgt95AgBpmytVdOLHQ=; b=nWJuodTSl+D6lIBPYNpWASD6Ln6urIkEalwVB5WcAVwDwACfiZemjTnIjP290LaMSX 7U/rcN5i6WR2NvKv28lQPKeJNgFaKj9yFUTHFZ1kj1yyYHZKcxkRXLtshJeAwV1XYaJ6 07jPF5buuqbZNlWGmLv6HVoAc2yrzk5m6bIQzSzKTqJ3iYpaX2N6TyxupJnYRV65QvmA Miz0w3txzWmEeV69r3UKYz/SWN8boCrTynHCCY8bx8cHQzOvvkSNADShw5Islhuh3QTf WYxVJI/+PyNAmI7PtUGN5y9C3Tz6VuMEMbx6jzPAgrO8YZiMfkbJidtPcsXb/Ece0F6u RHAg== X-Gm-Message-State: ALKqPwcQceClPHuADCyRYrqGCsp8UivKWUOE60nZlzO1lGVNtrZPTu81 GWNj1tNBNbUYOswGk1UlHfShbXmOr43+uE0ETWSCryuqzjNbEyV7teImuXhbN8xvHE9RMMaTLGP 2WxkdXCbITzi/v9kD3Glzo1XTTLuBABsO5bn4x1w7Y5V4xq85sxH48yOU2XVrX4Q= X-Received: by 2002:a65:45c7:: with SMTP id m7-v6mr8192330pgr.109.1527438095098; Sun, 27 May 2018 09:21:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqAu4XUb7aaXeq6UgiWwO18Y6y0stNdi/nQKKWcPyMqdhWLgcGy/A7Imvu3OPq7DfsyXBbv X-Received: by 2002:a65:45c7:: with SMTP id m7-v6mr8192288pgr.109.1527438094181; Sun, 27 May 2018 09:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527438094; cv=none; d=google.com; s=arc-20160816; b=eV31zD1ZKsEyLJX7yPk+dY/PCSlPN2qtOlpH8bBUScl7uQRZauVRrr3FXwYNsBjmSV wS8AV1rLzthwbxQHKAf7EXYsy47c+a7hcS/5CdMJsphICgeXH8kszik6jc9SO65oVjEQ O4qlcySJqKkkiwLHHmIiQidKmteI53BZjUMIY+Z5mh/Lgr0HWvdQuXHiFrHKT0q64WkG 8CGR6wDyMaze2PvzjExG2Jj5cbXw3mRLK7RasbRSkvH2dBsEYbyP8h3KXs1b+hO8HfTY LCfOx6459s0HsPRRrrUvz8EukphFjRvYDkFmpWj/SkAD/lHso5TUGaJzPUKGhwTeGkpd sn2Q== 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=vqdUWKq8lLjkrpZAPUvrfmYwrvgt95AgBpmytVdOLHQ=; b=ixi4muMGinFDBxT+aIOzNuwHOqszNXZkYfA0rYyxa3yL/RMaChP4XuFqoA4D/71PQG AL7dx9VueRjP0/CVh1IBgDeJQMTbNjz0nCl4eKxzP56+ZtCcbvFi39y3gzc+4XZjKMIt Fa8a9zgicXTVujvRSTUxnlSOugDYCVudJk3ubwNbGnaUAnATiMprgaWoY+KgQCLnoSf3 2FvQym2rRDnUKMMUeRcv1UtvhTUsYPkeYSECX8g61T34Z0wymY2c8ZFMae5+rBhzQXzN DvYKsPBejdP4kiDbgoYn239NK1Nbgmz+my6pjHG5iVLErTnnBPHeJdJHjFdgybpuYLpe Sf1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=a6e/HhYq; spf=pass (google.com: domain of srs0=ri55=io=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=rI55=IO=linuxfoundation.org=gregkh@kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id 5-v6si3709340pgb.430.2018.05.27.09.21.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 May 2018 09:21:34 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=ri55=io=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=a6e/HhYq; spf=pass (google.com: domain of srs0=ri55=io=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=rI55=IO=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 22A792088E; Sun, 27 May 2018 16:21:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527438093; bh=Zx7qdnQ3msARnIfoj4IaBrLCVUehAhE8u99s2RVXrB0=; h=Subject:To:Cc:From:Date:From; b=a6e/HhYqVAvT8A2OMoWUy0s2tupUmjM+g3SnoJoIc1eXN8qbmMZ4ni2RIPLQpUt6F zM7s2tJ5YfUzkAardZSoQ//2foy956skKivj1OGuxeC/Vyi7tL5ye7S/E4ri1X5xE0 18whjKU0C5cRxgBbmV7GI2INxTBaI8EJpLhll9l8= Subject: Patch "x86/mm: Do not forbid _PAGE_RW before init for __ro_after_init" has been added to the 4.9-stable tree To: 20180406205514.8D898241@viggo.jf.intel.com, aarcange@redhat.com, alexander.levin@microsoft.com, arjan@linux.intel.com, bp@alien8.de, dan.j.williams@intel.com, dave.hansen@linux.intel.com, dwmw2@infradead.org, gregkh@linuxfoundation.org, hughd@google.com, jgross@suse.com, jpoimboe@redhat.com, keescook@chromium.org, linux-mm@kvack.org, luto@kernel.org, mingo@kernel.org, namit@vmware.com, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org Cc: From: Date: Sun, 27 May 2018 17:59:56 +0200 Message-ID: <1527436796239228@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: Do not forbid _PAGE_RW before init for __ro_after_init to the 4.9-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-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Sun May 27 17:33:38 CEST 2018 From: Dave Hansen Date: Fri, 6 Apr 2018 13:55:14 -0700 Subject: x86/mm: Do not forbid _PAGE_RW before init for __ro_after_init From: Dave Hansen [ Upstream commit 639d6aafe437a7464399d2a77d006049053df06f ] __ro_after_init data gets stuck in the .rodata section. That's normally fine because the kernel itself manages the R/W properties. But, if we run __change_page_attr() on an area which is __ro_after_init, the .rodata checks will trigger and force the area to be immediately read-only, even if it is early-ish in boot. This caused problems when trying to clear the _PAGE_GLOBAL bit for these area in the PTI code: it cleared _PAGE_GLOBAL like I asked, but also took it up on itself to clear _PAGE_RW. The kernel then oopses the next time it wrote to a __ro_after_init data structure. To fix this, add the kernel_set_to_readonly check, just like we have for kernel text, just a few lines below in this function. Signed-off-by: Dave Hansen Acked-by: Kees Cook Cc: Andrea Arcangeli Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Dan Williams Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Hugh Dickins Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Nadav Amit Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180406205514.8D898241@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/pageattr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Patches currently in stable-queue which might be from dave.hansen@linux.intel.com are queue-4.9/x86-mm-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -279,9 +279,11 @@ static inline pgprot_t static_protection /* * The .rodata section needs to be read-only. Using the pfn - * catches all aliases. + * catches all aliases. This also includes __ro_after_init, + * so do not enforce until kernel_set_to_readonly is true. */ - if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT, + if (kernel_set_to_readonly && + within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT, __pa_symbol(__end_rodata) >> PAGE_SHIFT)) pgprot_val(forbidden) |= _PAGE_RW;