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

Commit 5fc8a2d9 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: kgsl: Properly handle attach error for secure pagetable 



Properly handle error paths in _init_secure_pt.

Change-Id: Ic0dedbadf297579a2cfbab6e40f2aac4752cca94
Signed-off-by: default avatarDeepak Kumar <dkumar@codeaurora.org>
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 0f9ebd55

drivers/gpu/msm/kgsl_iommu.c

+7 −5
Original line number Diff line number Diff line
@@ -1249,12 +1249,17 @@ static int _init_secure_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) 
	if (ret) {

		dev_err(device->dev, "set DOMAIN_ATTR_SECURE_VMID failed: %d\n",

			ret);

		goto done;

		_free_pt(ctx, pt);

		return ret;

	}



	_enable_gpuhtw_llc(mmu, iommu_pt->domain);



	ret = _attach_pt(iommu_pt, ctx);

	if (ret) {

		_free_pt(ctx, pt);

		return ret;

	}



	iommu_set_fault_handler(iommu_pt->domain,

				kgsl_iommu_fault_handler, pt);
@@ -1265,10 +1270,7 @@ static int _init_secure_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) 
			kgsl_iommu_map_secure_global(mmu, &md->memdesc);

	}



done:

	if (ret)

		_free_pt(ctx, pt);

	return ret;

	return 0;

}

#else

static int _init_secure_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt)