Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc44a6bb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix input checking when unmapping secure buffer"

parents f2a95b28 ae25cb6d

drivers/gpu/msm/kgsl_iommu.c

+9 −4
Original line number Diff line number Diff line
@@ -165,14 +165,19 @@ static int kgsl_iommu_map_globals(struct kgsl_pagetable *pagetable) 
}



void kgsl_iommu_unmap_global_secure_pt_entry(struct kgsl_device *device,

				struct kgsl_memdesc *entry)

				struct kgsl_memdesc *memdesc)

{

	if (!kgsl_mmu_is_secured(&device->mmu))

	if (!kgsl_mmu_is_secured(&device->mmu) || memdesc == NULL)

		return;



	if (entry != NULL && entry->pagetable->name == KGSL_MMU_SECURE_PT)

		kgsl_mmu_unmap(entry->pagetable, entry);

	/* Check if an empty memdesc got passed in */

	if ((memdesc->gpuaddr == 0) || (memdesc->size == 0))

		return;



	if (memdesc->pagetable) {

		if (memdesc->pagetable->name == KGSL_MMU_SECURE_PT)

			kgsl_mmu_unmap(memdesc->pagetable, memdesc);

	}

}



int kgsl_iommu_map_global_secure_pt_entry(struct kgsl_device *device,