| Message ID | 20211004103806.GD25015@kili (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm/msm: potential error pointer dereference in init() | expand |
On 2021-10-04 03:38, Dan Carpenter wrote: > The msm_iommu_new() returns error pointers on failure so check for that > to avoid an Oops. > > Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index ae48f41821cf..ad247c06e198 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -908,6 +908,10 @@ static int _dpu_kms_mmu_init(struct dpu_kms > *dpu_kms) > return 0; > > mmu = msm_iommu_new(dpu_kms->dev->dev, domain); > + if (IS_ERR(mmu)) { > + iommu_domain_free(domain); > + return PTR_ERR(mmu); > + } > aspace = msm_gem_address_space_create(mmu, "dpu1", > 0x1000, 0x100000000 - 0x1000);
On 04/10/2021 13:38, Dan Carpenter wrote: > The msm_iommu_new() returns error pointers on failure so check for that > to avoid an Oops. > > Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index ae48f41821cf..ad247c06e198 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -908,6 +908,10 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) > return 0; > > mmu = msm_iommu_new(dpu_kms->dev->dev, domain); > + if (IS_ERR(mmu)) { > + iommu_domain_free(domain); > + return PTR_ERR(mmu); > + } > aspace = msm_gem_address_space_create(mmu, "dpu1", > 0x1000, 0x100000000 - 0x1000); > >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index ae48f41821cf..ad247c06e198 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -908,6 +908,10 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) return 0; mmu = msm_iommu_new(dpu_kms->dev->dev, domain); + if (IS_ERR(mmu)) { + iommu_domain_free(domain); + return PTR_ERR(mmu); + } aspace = msm_gem_address_space_create(mmu, "dpu1", 0x1000, 0x100000000 - 0x1000);
The msm_iommu_new() returns error pointers on failure so check for that to avoid an Oops. Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++++ 1 file changed, 4 insertions(+)