| Message ID | 20190509082151.8823-1-tomeu.vizoso@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panfrost: Only put sync_out if non-NULL | expand |
On 09/05/2019 09:21, Tomeu Vizoso wrote: > Dan Carpenter's static analysis tool reported: > > drivers/gpu/drm/panfrost/panfrost_drv.c:222 panfrost_ioctl_submit() > error: we previously assumed 'sync_out' could be null (see line 216) > > Indeed, sync_out could be NULL if userspace doesn't send a sync object > ID for the out fence. > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Link: https://lists.freedesktop.org/archives/dri-devel/2019-May/217014.html Reviewed-by: Steven Price <steven.price@arm.com> > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index 94b0819ad50b..d11e2281dde6 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -219,7 +219,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, > fail_job: > panfrost_job_put(job); > fail_out_sync: > - drm_syncobj_put(sync_out); > + if (sync_out) > + drm_syncobj_put(sync_out); > > return ret; > } >
On Thu, May 9, 2019 at 3:22 AM Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote: > > Dan Carpenter's static analysis tool reported: > > drivers/gpu/drm/panfrost/panfrost_drv.c:222 panfrost_ioctl_submit() > error: we previously assumed 'sync_out' could be null (see line 216) > > Indeed, sync_out could be NULL if userspace doesn't send a sync object > ID for the out fence. > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Link: https://lists.freedesktop.org/archives/dri-devel/2019-May/217014.html > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied. Rob
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 94b0819ad50b..d11e2281dde6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -219,7 +219,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, fail_job: panfrost_job_put(job); fail_out_sync: - drm_syncobj_put(sync_out); + if (sync_out) + drm_syncobj_put(sync_out); return ret; }
Dan Carpenter's static analysis tool reported: drivers/gpu/drm/panfrost/panfrost_drv.c:222 panfrost_ioctl_submit() error: we previously assumed 'sync_out' could be null (see line 216) Indeed, sync_out could be NULL if userspace doesn't send a sync object ID for the out fence. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lists.freedesktop.org/archives/dri-devel/2019-May/217014.html --- drivers/gpu/drm/panfrost/panfrost_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)