From patchwork Mon Jul 12 06:05:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 473010 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2697317jao; Mon, 12 Jul 2021 00:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwA7RomEnrYimOjWYiA7+7nVQ3W18bMGm2b/rVZQw80syLEnQWmTOmmqgi8qMxXEjCvD+Fu X-Received: by 2002:a17:906:8683:: with SMTP id g3mr32764787ejx.126.1626075953840; Mon, 12 Jul 2021 00:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626075953; cv=none; d=google.com; s=arc-20160816; b=ma6UFwVFtQPi8m9SCIwVaAa0WQUOkUqiW+45K07I4c7PowKouRuNMIpv+I5jbBs7l6 sOJp2+S0OBcK15AB2UvORTKW9wJyermGYHkTeMCjRp3FW1Dax8+3scB1j+3wZMb6yUxr ol3T8ANuM/85nJmqWZg9p6heRc/Fw+1MwFdvYKKv+N6UltRfW2R3F2yauT1AZUPcaot1 ZLAzT894qlSqcSjnzpFAJZoyl0wqje58N6l852gs41FjhIxMYDd3hC+EfsT+utXJL8Kq 9fEinZARY0CuWWdl4Vs3aeHXZ4vcL/KtUXfBP9hZgJ6b04XA+4FeW/7rgDfYpj+/CzVz nSHw== 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=iluqnvmKssP20PjxEqR1yZOZpAWLYY3kmH4I0nKDdY4=; b=FvOYHrqVANC6LHhApP2nxW6hgpajwSV7v0R+uomNwG9TVUpHLJ+B4BrQsMcme4YgtR Lclufwj4vPvbtp/d/cOG7IeuL2c2a72DoakJ1mOBNXwHb6u8AWWV2MN0OL1tP+L/F0ut uFsapcvC9DLlQSE+TC8LjZS9Eg9SaKnrGc3PKKiYLgv0Hy7uoBi6+yJhTqzLH/8AsDlm UBloIM+ZEA1DQ+3aknB2ZozQVKz30DXOlVdHumYMptJJi5jBJR37+6+u8XXe3GF1ovH8 VUO+QDtERV1IS3QiUJgQpgT70GSeCQh6ioh0VqoASMJCy/yMSeQF7+EmNJeJu2yiRJn9 icWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s1AFik0b; 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 n21si13642925eda.13.2021.07.12.00.45.53; Mon, 12 Jul 2021 00:45:53 -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=s1AFik0b; 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 S1346566AbhGLHqm (ORCPT + 12 others); Mon, 12 Jul 2021 03:46:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:51356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349800AbhGLHoq (ORCPT ); Mon, 12 Jul 2021 03:44:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 32C4C61370; Mon, 12 Jul 2021 07:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626075670; bh=mVXKZSbt6sNXN4b9AvYG+zVYC6YHgMGjeAw7EmFRtnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s1AFik0bvi1JPpFi6rnRzN+2VLxoU8ALYayipITU6uS6ZkARYexcAlr6GgEhuBLY/ 8/J1v1Db4n8dXTPUL1S3Lo+efiRkMNF0RcOeA8wj94HpcLXV8tDht0qZsMqX7s5vxh GLVac/pSFzDT0MU8LRTSA48HNTcTySSMwYkDOpqI= 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.13 314/800] arm64/mm: Fix ttbr0 values stored in struct thread_info for software-pan Date: Mon, 12 Jul 2021 08:05:37 +0200 Message-Id: <20210712060959.041008091@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 d3cef9133539..eeb210997149 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]) {