Received: by 10.223.185.116 with SMTP id b49csp2245593wrg; Thu, 15 Feb 2018 08:40:51 -0800 (PST) X-Google-Smtp-Source: AH8x227+1Lu+aLr+QtisPIKsgQrvd7nhYIiqzYQqxIC4iAAt/gh0hFwfKFyi6c8Vcq1fX7UjcDS+ X-Received: by 10.98.163.67 with SMTP id s64mr1649881pfe.67.1518712851534; Thu, 15 Feb 2018 08:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518712851; cv=none; d=google.com; s=arc-20160816; b=p49hYp8R72lSSH1RYOGrMZMZ6Q/clLKASGTK33biUy0/qRU9MTP4jsViHz6HNKOdcV yzD198FryXWWeo/2hWKrSOdPdMUGBXbZa9w/5A8k6mEanhLIKM0tchvCyD91IhoUTrnV YJVukgz42zNcQDB2CWhEQwDw+apakMc8cQv4MoEKw0dVnoYVxc/mJQDb8i+BAJVtIWpA EPvxrEsuFotIdyPbhc3O9XZ1KAfLzSeilN2Kjv2YnwrDftdNDbm6B0YsJI3xFXECwX8P lx2xjVkDwe0XR1vSf17FPNpUSlrya0U2jyA4paPzAZ/yaGzAbA51oEq9+9+7DpFMhnc5 D3cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LJJ30nVEMH2BQg5YJ5bQnA9AXzDlQfSUxFPIHcKspIk=; b=rRZCkAvKMxJcvRGbe193lw8vxe9XRW9Tf1BudkE1wmp+d8QgWwmbpZVCdowLmcczCF tJpZHdeAr3mWmiVD9XlrkRUIBf6Lig4aQwYEogb82oWtsKG4zdRGvPNgW+39LYbY8oXA LgkmSgSLb66LhSF9L/yJPErqki5RLLUkAcmQxRiFLXbd9ej1Icc4nKKlooW6fjLvdiDz tvl1DVKQ26CNhFHgo03c98sVUphcr9o6bxPdbmWIAjnNCTPucsu/Rz8ySWxaWJlPJVif lMwvz7lCsOrPFJrOkPey4O2E8NzCQluQXbHcLGpCvIckVsYSunapM0slj93QsJkHAGh/ qKcw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u12si3361655pfl.24.2018.02.15.08.40.36; Thu, 15 Feb 2018 08:40:51 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426165AbeBOQi7 (ORCPT + 99 others); Thu, 15 Feb 2018 11:38:59 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:60676 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423532AbeBOPl2 (ORCPT ); Thu, 15 Feb 2018 10:41:28 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 47FC3C28; Thu, 15 Feb 2018 15:41:27 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon , Catalin Marinas Subject: [PATCH 4.15 047/202] [Variant 3/Meltdown] arm64: idmap: Use "awx" flags for .idmap.text .pushsection directives Date: Thu, 15 Feb 2018 16:15:47 +0100 Message-Id: <20180215151715.665160566@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215151712.768794354@linuxfoundation.org> References: <20180215151712.768794354@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Will Deacon Commit 439e70e27a51 upstream. The identity map is mapped as both writeable and executable by the SWAPPER_MM_MMUFLAGS and this is relied upon by the kpti code to manage a synchronisation flag. Update the .pushsection flags to reflect the actual mapping attributes. Reported-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cpu-reset.S | 2 +- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/sleep.S | 2 +- arch/arm64/mm/proc.S | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -16,7 +16,7 @@ #include .text -.pushsection .idmap.text, "ax" +.pushsection .idmap.text, "awx" /* * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -371,7 +371,7 @@ ENDPROC(__primary_switched) * end early head section, begin head code that is also used for * hotplug and needs to have the same protections as the text region */ - .section ".idmap.text","ax" + .section ".idmap.text","awx" ENTRY(kimage_vaddr) .quad _text - TEXT_OFFSET --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -96,7 +96,7 @@ ENTRY(__cpu_suspend_enter) ret ENDPROC(__cpu_suspend_enter) - .pushsection ".idmap.text", "ax" + .pushsection ".idmap.text", "awx" ENTRY(cpu_resume) bl el2_setup // if in EL2 drop to EL1 cleanly bl __cpu_setup --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -86,7 +86,7 @@ ENDPROC(cpu_do_suspend) * * x0: Address of context pointer */ - .pushsection ".idmap.text", "ax" + .pushsection ".idmap.text", "awx" ENTRY(cpu_do_resume) ldp x2, x3, [x0] ldp x4, x5, [x0, #16] @@ -152,7 +152,7 @@ ENTRY(cpu_do_switch_mm) ret ENDPROC(cpu_do_switch_mm) - .pushsection ".idmap.text", "ax" + .pushsection ".idmap.text", "awx" .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 adrp \tmp1, empty_zero_page @@ -184,7 +184,7 @@ ENDPROC(idmap_cpu_replace_ttbr1) .popsection #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 - .pushsection ".idmap.text", "ax" + .pushsection ".idmap.text", "awx" .macro __idmap_kpti_get_pgtable_ent, type dc cvac, cur_\()\type\()p // Ensure any existing dirty @@ -373,7 +373,7 @@ ENDPROC(idmap_kpti_install_ng_mappings) * Initialise the processor for turning the MMU on. Return in x0 the * value of the SCTLR_EL1 register. */ - .pushsection ".idmap.text", "ax" + .pushsection ".idmap.text", "awx" ENTRY(__cpu_setup) tlbi vmalle1 // Invalidate local TLB dsb nsh