TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: kgsl: Fix upper bound check for iommu address"

Browse Source
This commit is contained in:
qctecmdr
2024-03-27 02:58:06 -07:00
committed by Gerrit - the friendly Code Review server
parent 4e61699283 f2f1efbbc2
commit 63b678c6fe
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/msm/kgsl_iommu.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2011-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2011-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/compat.h> #include <linux/compat.h>
@@ -2586,18 +2586,19 @@ static bool kgsl_iommu_addr_in_range(struct kgsl_pagetable *pagetable,
uint64_t gpuaddr, uint64_t size) uint64_t gpuaddr, uint64_t size)
{ {
struct kgsl_iommu_pt *pt = pagetable->priv; struct kgsl_iommu_pt *pt = pagetable->priv;
u64 end = gpuaddr + size;
if (gpuaddr == 0) /* Make sure we don't wrap around */
if (gpuaddr == 0 || end < gpuaddr)
return false; return false;
if (gpuaddr >= pt->va_start && (gpuaddr + size) < pt->va_end) if (gpuaddr >= pt->va_start && end <= pt->va_end)
return true; return true;
if (gpuaddr >= pt->compat_va_start && if (gpuaddr >= pt->compat_va_start && end <= pt->compat_va_end)
(gpuaddr + size) < pt->compat_va_end)
return true; return true;
if (gpuaddr >= pt->svm_start && (gpuaddr + size) < pt->svm_end) if (gpuaddr >= pt->svm_start && end <= pt->svm_end)
return true; return true;
return false; return false;