From patchwork Wed May 2 18:16:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10376297 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 06F0E60384 for ; Wed, 2 May 2018 18:27:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E872528DC4 for ; Wed, 2 May 2018 18:27:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC62428F7A; Wed, 2 May 2018 18:27:46 +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 282F828DC4 for ; Wed, 2 May 2018 18:27:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F10746B0009; Wed, 2 May 2018 14:27:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E979E6B000A; Wed, 2 May 2018 14:27:44 -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 D393C6B000C; Wed, 2 May 2018 14:27:44 -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 8BD326B0009 for ; Wed, 2 May 2018 14:27:44 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id t74-v6so3252102pgc.14 for ; Wed, 02 May 2018 11:27:44 -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=p5deAdB7XUtQ3Vvd9+oLVgnaaKhPzeZIonUuLmgBBbU=; b=WfnBkHV5GCBAPBecW7YmCWU6/4ehMfmrX3VQnNf50OQazUmS33J4QNLue9FaXBc9BV Oo24yty84OyJlY2U8yyDsGEUlNeyjL1onsVXD5l81nCXwSxZ+luaM8lR5qFf4P7x7/Mk Zl7nhrprYjTDkxIPaFrbn/+5QT2OTDf2TF8HAVYmMvx2wGR89EDsqpAszHD2n0k7a1RN 6ebsPpzv5d38hgu1ZTxSM0G3uADB4EnisObq8GATRTEIUpjNpyOZVSttTN4G/avyfx7o tobZlFcIOJje2t9wReINSRl+tUe7MV+n1ZbQ+Rz2i9UcYbO8SoXW3cVv0uE3GiW22AfA Goag== X-Gm-Message-State: ALQs6tAHQfU6X932ohZqQW0aJP7Xg1RDmwpq+qLf723oQRTpj42xxBty fFoDFmwXWOiEclVdPo6jgcD5No+wOkN/94LljT2CNL+UdQiQ6QhorvdBkevZI4Bl9xLv2YlSDUG 8X/j5nbfagNmP7D0Ga/u+/mPHX0WeEHtNMBsfmE0pkIJEHF/1n5dIx5T/Gunc708= X-Received: by 2002:a63:7258:: with SMTP id c24-v6mr17288042pgn.453.1525285664220; Wed, 02 May 2018 11:27:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrkL4fHYGi9PSfNAy120blJHrLvrD6jLlOpqPP5oD4AqVItc8sMvXoeBT8baIbGcowpzlM6 X-Received: by 2002:a63:7258:: with SMTP id c24-v6mr17288011pgn.453.1525285663471; Wed, 02 May 2018 11:27:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525285663; cv=none; d=google.com; s=arc-20160816; b=ov6MaUHDmLubZp92SfM2bwYlVzU2SbnN6jMt1xyWQG7KztaFfTxIyky4CTW0PYK1LU OJXC9mPY4QRnv0tNR39Z8pl82P0YWcC68CPGpKXbPN3rscEB6yOGANtCShZo6CIUOrFs b4q1uAtuCp8muGKd5LsEvx+hHjPwXTUVk6wz/aUiHUBQl5/YIgW3BqxA0L1g18qHRgNW WIDbKh5j+KvddEj24+XgD8YBxUJMSRDhAGUmyYGR9eO84KNjhGTmzO2avXF+RG7B33+a 36yGdZBLIJyLwyffKRY4CKv+bIBea5LqQ6W0nvydAPJ04K7RfVsnp+nUBCQq3PSDZLpu pTow== 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=p5deAdB7XUtQ3Vvd9+oLVgnaaKhPzeZIonUuLmgBBbU=; b=CWNTwPm71mwfS/Oy7+yzv2+SQIOU3P8QsP79vjCjqt6dW+6wQvdZ9eiZViWwXT5dgq FGOKkntqBvH4E9IzSX/vj0e6wAOZaGCWlRlqmmb8bsp8S+4gawrpuIVAZ88VBjBHx/EL uTAK1nI0YNpztdJgnC9Lftvhm4iU8JAS/qWUP+SyqEv9pZrKk2fz+9D4PPwW6ZAPWg2o IWjk8I1CX+GG9GnkQaIAT364Sgg/5H69NQHuwEjB33TLs3BrPblzeF9tM57dEHmO0WXU hJ30mTcaXsmPfxto/kxS4eEhvJ8z2FbXXCTAjROB8ywKsl5tQCjhHk+nrEmpZ4vQjsSS q+6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J74d9oYy; 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 t184si12317006pfb.98.2018.05.02.11.27.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 11:27:43 -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=J74d9oYy; 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 F358D2396B; Wed, 2 May 2018 18:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1525285663; bh=GUbOTROIyuGngWgE68WwfazBg9a0sMiXluEw3QQDB0w=; h=Subject:To:Cc:From:Date:From; b=J74d9oYyWuhaw79hQmfyf9xSXbbERovS4XInMSHeZSC0rMwMvzZCcdHU5BcQ2kwiy n34HjbwAQM95g/Q2VV4cTnrR0USdd1nJG6+RgGfzgh5pRaXmuR93FK20X6ubjcPdy4 hd3KgnmYRFrcMjGTJqu0/EajNGOupIc3UF+cBH9k= 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: Wed, 02 May 2018 11:16:55 -0700 Message-ID: <1525285015209214@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 Wed May 2 10:53:11 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-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;