Merge "msm: kgsl: Fix NULL pointer dereference" (3586dbb4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl_iommu.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2050,6 +2050,8 @@ kgsl_iommu_get_current_ttbr0(struct kgsl_mmu *mmu)
		{
		u64 val;
		struct kgsl_iommu *iommu = _IOMMU_PRIV(mmu);
		struct kgsl_iommu_context *ctx = &iommu->ctx[KGSL_IOMMU_CONTEXT_USER];

		/*
		* We cannot enable or disable the clocks in interrupt context, this
		* function is called from interrupt context if there is an axi error
		@@ -2057,9 +2059,11 @@ kgsl_iommu_get_current_ttbr0(struct kgsl_mmu *mmu)
		if (in_interrupt())
		return 0;

		if (ctx->regbase == NULL)
		return 0;

		kgsl_iommu_enable_clk(mmu);
		val = KGSL_IOMMU_GET_CTX_REG_Q(&iommu->ctx[KGSL_IOMMU_CONTEXT_USER],
		TTBR0);
		val = KGSL_IOMMU_GET_CTX_REG_Q(ctx, TTBR0);
		kgsl_iommu_disable_clk(mmu);
		return val;
		}