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

Commit a37a2c1a 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: Avoid a NULL dereference in kgsl_iommu_destroy_pagetable"

parents dff422e6 75f44d14

drivers/gpu/msm/kgsl_iommu.c

+5 −4
Original line number Diff line number Diff line
@@ -636,12 +636,13 @@ static int kgsl_iommu_pt_equal(struct kgsl_mmu *mmu, 
static void kgsl_iommu_destroy_pagetable(struct kgsl_pagetable *pt)

{

	struct kgsl_iommu_pt *iommu_pt = pt->priv;

	phys_addr_t domain_ptbase = iommu_get_pt_base_addr(iommu_pt->domain);



	if (iommu_pt->domain)

		msm_unregister_domain(iommu_pt->domain);



	if (iommu_pt->domain) {

		phys_addr_t domain_ptbase =

			iommu_get_pt_base_addr(iommu_pt->domain);

		trace_kgsl_pagetable_destroy(domain_ptbase, pt->name);

		msm_unregister_domain(iommu_pt->domain);

	}



	kfree(iommu_pt);

	iommu_pt = NULL;