From patchwork Wed May 2 20:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10376501 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 3BC946037D for ; Wed, 2 May 2018 20:46:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B52428CC9 for ; Wed, 2 May 2018 20:46:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 202BB29028; Wed, 2 May 2018 20:46:55 +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 0288128CC9 for ; Wed, 2 May 2018 20:46:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B99B46B0005; Wed, 2 May 2018 16:46:51 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B209B6B0010; Wed, 2 May 2018 16:46:51 -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 9C2766B0011; Wed, 2 May 2018 16:46:51 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id 590D06B0005 for ; Wed, 2 May 2018 16:46:51 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id r9-v6so6833945pgp.12 for ; Wed, 02 May 2018 13:46:51 -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=i3zh9RCvKmLFMavNEjPaC/go5LpmRn69oRyorZK+nJQ=; b=tmW6g5jz1i04YA2MqXzPB+BJLfXP9NdcYzImbBsDkr473FT0fHfBCJjJmdnDFyODu3 OmW8WtP/F1dhLUFl7rn/Q06APZHM6s8zeAT+uPnI9vLHTufaW/kE9ccVbbF9u3CDBdGA yMY2BhvT/QVibnQit5LGXHZ4Ic0N1hD3wAdwh4twe7iyGvfq2JFUOr9QCgPy/LgBLDum 2c/X94+zwEOYS9FwRnL0oEn+dd86GhzTKaqWn1dV3t0i1DBCHxg7cGP7a8FF7fF9uft1 NqA3Ihy5ldQP4bu/hnjKGmNhu3S36CXH6O1bpuuwvk7nxHx/rfxZxhNhp3DnG1fhT7ai lu5A== X-Gm-Message-State: ALQs6tD1cUq3E96WMlRhPo9FiTxxZLzRjdlMK6poZu5jtc2g/qRy4yWZ U1UUaEdPGm3usde1+Y+mYOFuqZHbwRF4TP3OQkCTpW7xVapiJY1ygL9NTYhSwjkMVB9GDXtF18X 0bhKwsxtOJ1eFSEUas4ktUk8ukrKstw/57S3Q/LsdsPCagELYHKQDml1Klg4DIVw= X-Received: by 2002:a17:902:8f96:: with SMTP id z22-v6mr340410plo.200.1525294010978; Wed, 02 May 2018 13:46:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqkRFMpWBLHxxOhyaXlSkVUDRHN3NKs1fUhAFRhXHqvtfCXdvsEW2jPZT2PvoePZi/0LLf/ X-Received: by 2002:a17:902:8f96:: with SMTP id z22-v6mr340377plo.200.1525294010116; Wed, 02 May 2018 13:46:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525294010; cv=none; d=google.com; s=arc-20160816; b=mdf5xbyrgEUta87OQMW8OcX+bz1lFVdrE6Ft7wKRRu9Rytr8SDGTMf5culpU1R0Kmk CMiiZf1qZtck2b23oFqzRknv9clymrs5fR/bDmzo43XMaLLt/NbMXT6My0nxzynuoPSO QGfuxxgdRy3FHgZ5DB2eslbICTDaSgNC4zicqGPaFqWKQUKFl40+NvNFTrz3qE3BD7pY 4t59mea8WP+L6gX84brHSH3v73RDcA4OMdDsfoKkAUQ0sYFnOyCJT3cPr6EsiocssIlv 4Qv8ZD4Es5TS++MLm9z8dHF607zTkujVtvDNpTP4+R9M3Tkf6FaseuWDtkOA0zF0FXAL Wm7A== 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=i3zh9RCvKmLFMavNEjPaC/go5LpmRn69oRyorZK+nJQ=; b=iLqtNY5g9hx9ZQfOBnWamNSPG101Vt9bC0heEvIdu+SxkWQQQIn2Avol9uPEteCuBw UZMRDgtg4JP9bTXxwOiBwjNY4LSIAwTD2+WkHbypnRNu8DzNpoS3Auu12Ao89KopXKWV XxPJrUhABaS32psKd4Z80T8NxxXyA4BP38PNfhgylr5zKJ2/GHLov1V/sOMIPBUYBAAp //fD1ckAGNyCNERY2AZ8Ezq+Xw/O8o/fUr/Y4OY48roufN+/i/CuaDnhWAOR9xnE5uSh SxrYbPUhftnSlDO2dsBOiWd5f25N9NMmA5xBU/wsN0rubbWAhAga35H3X82mGl4u1frc dW/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FFbfE9qu; spf=pass (google.com: domain of srs0=nwvz=hv=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nwvz=HV=linuxfoundation.org=gregkh@kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id 145-v6si10025753pgd.561.2018.05.02.13.46.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 13:46:50 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=nwvz=hv=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=FFbfE9qu; spf=pass (google.com: domain of srs0=nwvz=hv=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nwvz=HV=linuxfoundation.org=gregkh@kernel.org Received: from localhost (unknown [104.132.1.102]) (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 A3E2C2394F; Wed, 2 May 2018 20:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1525294009; bh=PTpIpJfnZflKd+6f7tyUkuFLMtRiABtatzdOktqM0jg=; h=Subject:To:Cc:From:Date:From; b=FFbfE9quHoZR3OoQmyfFzHcbildaoyj0gDvhLJ5O59VOxs2MZp278hqdIeyP0gnnJ n/Zhknq1y+239re4cWipIbcR3h+HTq9JSvDBGqx/LfBxOQVbe2+AwsWOFaB/qVET5i irNZf6KEv49ewUPsnCZjsf2+RSk/3HUHppMSagbA= Subject: Patch "x86/mm: Do not forbid _PAGE_RW before init for __ro_after_init" has been added to the 3.18-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: Wed, 02 May 2018 13:43:44 -0700 Message-ID: <1525293824250187@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 3.18-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-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Wed May 2 13:21:44 PDT 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-3.18/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 @@ -275,9 +275,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;