Received: by 10.223.185.116 with SMTP id b49csp4184165wrg; Mon, 26 Feb 2018 12:45:23 -0800 (PST) X-Google-Smtp-Source: AG47ELvLgQ3FuKEFQOgOeRRBWl32H9umikf6dNJd3/VMaDlJJaNiZOv+5wji4ZKPu6IPCTr3cPLD X-Received: by 10.99.168.8 with SMTP id o8mr3290259pgf.246.1519677923381; Mon, 26 Feb 2018 12:45:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677923; cv=none; d=google.com; s=arc-20160816; b=RPGwKbCys3v/OaU8A/SL0QdMRfnFmTFkmnZNjO1p/QQGnlEjE2CYg5Ds8/WaVlKGiP 99CKmqQf62D+79c6WMXNnuW66tvIvQi8Rdpxqwo6LagVFAyDJcnloR+S0GkIbaE0PiIh LkUg0VYa+BOlKOFZLblFhBlbEXRiKaN8Km83v7SP58PwgnxaehAYTk4B7LqKAIqQf5NU 9QnpXvpDjcSvX/LlTYYYZ9a6FnG04ijmBGNpk+6NP8/kLDNY6iwKdpqLl657ZkpY0ml2 pPQeAfIoqw3HFZ27CZ6RhsXoHwKO6CCEYo4t1x642bk3Cech1c28bxvohYKp3yoh00yW /Vmw== 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=wQhfSaKrdkblMerMNF4n4SeyuCx2TmQXbFmghVkJW6Q=; b=rCMPGTMU5NgNkuaM8XD/2RtuwzylOIqcG22o0+k3y6cHCfjvCN23VCyaHR9gyFq6LP 8AOXfVfl0BZEBuz88p0dmNspNl41m7WDhQVfeiKzjE+MINyVAV3SxOlNjZrzSzHG18iP 4W9oZZ7SedVdK3JqfK+A0F52WtLFAw0s0Ve+Mynw4HPBS5R9hSAsfs+ox+X3EsZCY5DB r2K3FCVQAyluKsyZ2ooR+we51yNVAknpuGZO1yiZgQvV+gUBhkT6SIdkJMHUjuUo7XjC yLZ2sM2Bh81tOG01MmQCcqYWamyDNGdHnMgl1gBwLQV23yWTLTEfUzDGi6KStjktbIB8 qNrg== 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 i1-v6si3537043pld.260.2018.02.26.12.45.07; Mon, 26 Feb 2018 12:45:23 -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 S1753507AbeBZU0m (ORCPT + 99 others); Mon, 26 Feb 2018 15:26:42 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:35800 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753389AbeBZU0k (ORCPT ); Mon, 26 Feb 2018 15:26:40 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 86603103E; Mon, 26 Feb 2018 20:26:39 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Dechesne , Ard Biesheuvel , Will Deacon Subject: [PATCH 4.15 02/64] arm64: mm: dont write garbage into TTBR1_EL1 register Date: Mon, 26 Feb 2018 21:21:39 +0100 Message-Id: <20180226202153.550888076@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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: Ard Biesheuvel Stable backport commit 173358a49173 ("arm64: kpti: Add ->enable callback to remap swapper using nG mappings") of upstream commit f992b4dfd58b did not survive the backporting process unscathed, and ends up writing garbage into the TTBR1_EL1 register, rather than pointing it to the zero page to disable translations. Fix that. Cc: #v4.14 Reported-by: Nicolas Dechesne Signed-off-by: Ard Biesheuvel Acked-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/mm/proc.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -155,7 +155,7 @@ ENDPROC(cpu_do_switch_mm) .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 adrp \tmp1, empty_zero_page - msr ttbr1_el1, \tmp2 + msr ttbr1_el1, \tmp1 isb tlbi vmalle1 dsb nsh