| Message ID | 20230713020556.1956639-3-cuigaosheng1@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix IS_ERR() vs NULL check for drm | expand |
On 7/12/2023 7:05 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. > > Fixes: 6a8bd08d0465 ("drm/msm: add sudo flag to submit ioctl") > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- You dropped Dmitry's R-b in this revision. https://patchwork.freedesktop.org/patch/511035/?series=110745&rev=1 If you are going to spin a v3, pls add it back. Otherwise I will while applying. > 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..a499e3b350fc 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(ptr))) > return; > > for (i = 0; i < dwords; i++) {
On Thu, Jul 13, 2023 at 10:05:55AM +0800, Gaosheng Cui wrote: > > 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: Abhinav Kumar <quic_abhinavk@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..a499e3b350fc 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(ptr))) nit: can we make this IS_ERR_OR_NULL() check to retain the current validation? A null is catastrophic here. Yeah, I see that the current implementation of ...get_vaddr() doesn't return a NULL. Reviewed-by: Akhil P Oommen <quic_akhilpo@quicinc.com> -Akhil > return; > > for (i = 0; i < dwords; i++) { > -- > 2.25.1 >
On Thu, 13 Jul 2023 at 22:08, Akhil P Oommen <quic_akhilpo@quicinc.com> wrote: > > On Thu, Jul 13, 2023 at 10:05:55AM +0800, Gaosheng Cui wrote: > > > > 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: Abhinav Kumar <quic_abhinavk@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..a499e3b350fc 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(ptr))) > nit: can we make this IS_ERR_OR_NULL() check to retain the current > validation? A null is catastrophic here. Yeah, I see that the current > implementation of ...get_vaddr() doesn't return a NULL. I generally dislike IS_ERR_OR_NULL, as it is always (incorrectly) paired with PTR_ERR. But in the case of void return it would be a perfect fit. > > Reviewed-by: Akhil P Oommen <quic_akhilpo@quicinc.com> > > -Akhil > > > return; > > > > for (i = 0; i < dwords; i++) { > > -- > > 2.25.1 > >
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index a99310b68793..a499e3b350fc 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(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: Abhinav Kumar <quic_abhinavk@quicinc.com> --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)