| Message ID | 20230714014820.2186203-3-cuigaosheng1@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix IS_ERR() vs NULL check for drm | expand |
On 7/13/2023 6:48 PM, Gaosheng Cui wrote: > The msm_gem_get_vaddr() returns an ERR_PTR() on failure, we should > use IS_ERR() to check the return value. > use IS_ERR_OR_NULL() I can even fix this while applying > Fixes: 6a8bd08d0465 ("drm/msm: add sudo flag to submit ioctl") > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > Reviewed-by: Akhil P Oommen <quic_akhilpo@quicinc.com> > --- > drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > index a99310b68793..bbb1bf33f98e 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > @@ -89,7 +89,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit > * since we've already mapped it once in > * submit_reloc() > */ > - if (WARN_ON(!ptr)) > + if (WARN_ON(IS_ERR_OR_NULL(ptr))) > return; > > for (i = 0; i < dwords; i++) {
On 7/14/2023 12:10 PM, Abhinav Kumar wrote: > > > On 7/13/2023 6:48 PM, Gaosheng Cui wrote: >> The msm_gem_get_vaddr() returns an ERR_PTR() on failure, we should >> use IS_ERR() to check the return value. >> > > use IS_ERR_OR_NULL() > > I can even fix this while applying > Actually even subject line needs correction, so better you push another rev. >> Fixes: 6a8bd08d0465 ("drm/msm: add sudo flag to submit ioctl") >> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> >> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> >> Reviewed-by: Akhil P Oommen <quic_akhilpo@quicinc.com> >> --- >> drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c >> b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c >> index a99310b68793..bbb1bf33f98e 100644 >> --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c >> +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c >> @@ -89,7 +89,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, >> struct msm_gem_submit *submit >> * since we've already mapped it once in >> * submit_reloc() >> */ >> - if (WARN_ON(!ptr)) >> + if (WARN_ON(IS_ERR_OR_NULL(ptr))) >> return; >> for (i = 0; i < dwords; i++) {
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index a99310b68793..bbb1bf33f98e 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -89,7 +89,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit * since we've already mapped it once in * submit_reloc() */ - if (WARN_ON(!ptr)) + if (WARN_ON(IS_ERR_OR_NULL(ptr))) return; for (i = 0; i < dwords; i++) {
The msm_gem_get_vaddr() returns an ERR_PTR() on failure, we should use IS_ERR() to check the return value. Fixes: 6a8bd08d0465 ("drm/msm: add sudo flag to submit ioctl") Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Akhil P Oommen <quic_akhilpo@quicinc.com> --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)