From patchwork Mon Jul 12 06:06:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472950 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2674327jao; Mon, 12 Jul 2021 00:11:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHGNJNUuIYQkCVo0NGC4KxDFx9R/4asY6ScSScW/i0CX5VMERf++0auGix/Y3FAZ4qO3nk X-Received: by 2002:a92:a013:: with SMTP id e19mr16417596ili.206.1626073876005; Mon, 12 Jul 2021 00:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626073875; cv=none; d=google.com; s=arc-20160816; b=Nln/uc9v08Oi4YHulxBfQ1FFDEikpCZMyIrKAVOtgtRU1JfQe8pE14DtJJwl7ewSgg OBNLUR+6FcW8jR06O2LzEvKAZ0JdIdZ/y9uSRp1xFwpXX7j2IGnlErX1XcWwOCMZ6A1k ZDOhVWjObs9/ttHRK9ACvju57vQLlONIb+nVddU9T63D4c0Y3RPS3d657Zxzh6KbY9SG H8YV0HlSp5ZUmh9qVMNT91lIkrFxGFMySSUz1/AsX7SZrb/PXN1pIDJf5ht8HXE8CK9X u/LVIVNMbZIX4JhWB7J7Na9/L+eCGuF20UVCdM35eYmLLEQofZ0oOFSFICY8MAfLvRIb o6vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=su6pNjk6LL6WT/vXaEfqgG/PffoYDNHjfeh5TcJimJA=; b=T2zCAQOo9Su5VisjaN/CuSXk0O0+ZRAnB/eGaNVIlPJDxuhffHNrnaO5GImP1v3lzu I5Ty9zQ8YWVMr/tTW8X6+DtidjTQYmVUIbYOugxjqSQlMwXNaOw0Ov3wCfvALC/MNEXL EbR775oOzmMDJzM3QEcTeBBDQg8evzY+xg/Fj3r0yHzEIdlQu1/W2/YUmHRjeql+v8q9 5RVrTxTnBFSyh6mquGkIhbcyIX5rINmN+YlwFvMH+TXV7zcm0oAar0vXxRH/g5yIulvQ tfwTxqpzbKFzXCtqV544teU/1WGTMfnRhehpCaTnXQ9g1N9vYljEPV8+nH8B+42jeV1J 0d1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gD7zSXKY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si16580694jas.65.2021.07.12.00.11.15; Mon, 12 Jul 2021 00:11:15 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gD7zSXKY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242269AbhGLHMm (ORCPT + 12 others); Mon, 12 Jul 2021 03:12:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:42764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244132AbhGLHK0 (ORCPT ); Mon, 12 Jul 2021 03:10:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B0CA61107; Mon, 12 Jul 2021 07:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626073577; bh=e6MK2jsGWoD0XBWHwwKu4MHpih1TgeMFmpbHGInaer0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gD7zSXKYlvOIXKNlH2BZaT7jPzGtm06lRV72658jsOu3HjyJpWYYlL4pvxAj7qFDB bsfZjBTvdjLXGaFnhFSbHfpuWPKb6rMrpv7z5Vy2dXYleuNV/35eXLmZ9p9Z0ncpO8 6Q2hxg6qow7KMhDDqKp4bXeNqEP82QPKrXymyqFI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , James Morse , linux-arm-kernel@lists.infradead.org, Anshuman Khandual , Sasha Levin Subject: [PATCH 5.12 288/700] arm64/mm: Fix ttbr0 values stored in struct thread_info for software-pan Date: Mon, 12 Jul 2021 08:06:11 +0200 Message-Id: <20210712061006.862869089@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anshuman Khandual [ Upstream commit 9163f01130304fab1f74683d7d44632da7bda637 ] When using CONFIG_ARM64_SW_TTBR0_PAN, a task's thread_info::ttbr0 must be the TTBR0_EL1 value used to run userspace. With 52-bit PAs, the PA must be packed into the TTBR using phys_to_ttbr(), but we forget to do this in some of the SW PAN code. Thus, if the value is installed into TTBR0_EL1 (as may happen in the uaccess routines), this could result in UNPREDICTABLE behaviour. Since hardware with 52-bit PA support almost certainly has HW PAN, which will be used in preference, this shouldn't be a practical issue, but let's fix this for consistency. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: James Morse Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Fixes: 529c4b05a3cb ("arm64: handle 52-bit addresses in TTBR") Signed-off-by: Anshuman Khandual Reviewed-by: Catalin Marinas Link: https://lore.kernel.org/r/1623749578-11231-1-git-send-email-anshuman.khandual@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/mmu_context.h | 4 ++-- arch/arm64/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index bd02e99b1a4c..44dceac442fc 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -177,9 +177,9 @@ static inline void update_saved_ttbr0(struct task_struct *tsk, return; if (mm == &init_mm) - ttbr = __pa_symbol(reserved_pg_dir); + ttbr = phys_to_ttbr(__pa_symbol(reserved_pg_dir)); else - ttbr = virt_to_phys(mm->pgd) | ASID(mm) << 48; + ttbr = phys_to_ttbr(virt_to_phys(mm->pgd)) | ASID(mm) << 48; WRITE_ONCE(task_thread_info(tsk)->ttbr0, ttbr); } diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 61845c0821d9..68b30e8c22db 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -381,7 +381,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) * faults in case uaccess_enable() is inadvertently called by the init * thread. */ - init_task.thread_info.ttbr0 = __pa_symbol(reserved_pg_dir); + init_task.thread_info.ttbr0 = phys_to_ttbr(__pa_symbol(reserved_pg_dir)); #endif if (boot_args[1] || boot_args[2] || boot_args[3]) {