diff options
| author | Fred Lundquist <flundquist@google.com> | 2024-02-14 03:39:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-16 18:17:22 +0000 |
| commit | a39c71321ca4c0bd93952f01be3d4dbecf1a7db4 (patch) | |
| tree | 4ee5bb080ce29457e706d4e733996177afc87e48 | |
| parent | 36cf72bcf576343b2858e434afe3be5cd0cf8f5e (diff) | |
| download | msm-a39c71321ca4c0bd93952f01be3d4dbecf1a7db4.tar.gz | |
Merge UAF fix for April 2024 QPR into android13-msm-pixelwatch-5.15
msm: adsprpc: Handle UAF in process shell memory
Bug: 318393412
Bug: 320163491
Signed-off-by: Fred Lundquist <flundquist@google.com>
(cherry picked from commit f9cc8d520ba2c0aa92055c673a7c4d84eea41e77)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:93f3a06151db409832674f685bc61479d7edfd43)
Merged-In: Iffe6d16f36c784b050274dffd39f84346b996e67
Change-Id: Iffe6d16f36c784b050274dffd39f84346b996e67
| -rw-r--r-- | drivers/iommu/qcom-io-pgtable-arm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iommu/qcom-io-pgtable-arm.c b/drivers/iommu/qcom-io-pgtable-arm.c index ce8e40612e37..172fd6bf01d1 100644 --- a/drivers/iommu/qcom-io-pgtable-arm.c +++ b/drivers/iommu/qcom-io-pgtable-arm.c @@ -6,7 +6,7 @@ * * Author: Will Deacon <will.deacon@arm.com> * - * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt @@ -744,8 +744,10 @@ static int arm_lpae_map_by_pgsize(struct io_pgtable_ops *ops, if (ms->pgtable && (iova < ms->iova_end)) { ms_ptep = ms->pgtable + ARM_LPAE_LVL_IDX(iova, MAP_STATE_LVL, data); - arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL, + ret = arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL, 1, ms_ptep, ms->prev_pgtable, false); + if (ret) + return ret; ms->num_pte++; } else { ret = __arm_lpae_map(data, iova, paddr, pgsize, 1, |