Commit d4bd93bc authored by Volodymyr Babchuk's avatar Volodymyr Babchuk Committed by dinglongwei
Browse files

soc: qcom: cmd-db: Map shared memory as WC, not WB

stable inclusion
from stable-v5.10.225
commit f5a5a5a0e95f36e2792d48e6e4b64e665eb01374
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAR5ZD
CVE: CVE-2024-46689

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f5a5a5a0e95f36e2792d48e6e4b64e665eb01374



--------------------------------

commit f9bb896eab221618927ae6a2f1d566567999839d upstream.

Linux does not write into cmd-db region. This region of memory is write
protected by XPU. XPU may sometime falsely detect clean cache eviction
as "write" into the write protected region leading to secure interrupt
which causes an endless loop somewhere in Trust Zone.

The only reason it is working right now is because Qualcomm Hypervisor
maps the same region as Non-Cacheable memory in Stage 2 translation
tables. The issue manifests if we want to use another hypervisor (like
Xen or KVM), which does not know anything about those specific mappings.

Changing the mapping of cmd-db memory from MEMREMAP_WB to MEMREMAP_WT/WC
removes dependency on correct mappings in Stage 2 tables. This patch
fixes the issue by updating the mapping to MEMREMAP_WC.

I tested this on SA8155P with Xen.

Fixes: 312416d9 ("drivers: qcom: add command DB driver")
Cc: stable@vger.kernel.org # 5.4+
Signed-off-by: default avatarVolodymyr Babchuk <volodymyr_babchuk@epam.com>
Tested-by: Nikita Travkin <nikita@trvn.ru> # sc7180 WoA in EL2
Signed-off-by: default avatarMaulik Shah <quic_mkshah@quicinc.com>
Tested-by: default avatarPavankumar Kondeti <quic_pkondeti@quicinc.com>
Reviewed-by: default avatarCaleb Connolly <caleb.connolly@linaro.org>
Link: https://lore.kernel.org/r/20240718-cmd_db_uncached-v2-1-f6cf53164c90@quicinc.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatardinglongwei <dinglongwei1@huawei.com>
parent 950c74b8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int cmd_db_dev_probe(struct platform_device *pdev)
		return -EINVAL;
	}

	cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WB);
	cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WC);
	if (!cmd_db_header) {
		ret = -ENOMEM;
		cmd_db_header = NULL;