* [PATCH] drm: virtio: fix kmem_cache_alloc error check
@ 2017-03-13 8:22 Gerd Hoffmann
2017-03-13 10:24 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Gerd Hoffmann @ 2017-03-13 8:22 UTC (permalink / raw)
To: dri-devel
Cc: Gerd Hoffmann, David Airlie, open list:VIRTIO GPU DRIVER, open list
kmem_cache_alloc returns NULL on error, not ERR_PTR.
Fixes: f5985bf9cadd4e3ed8d5d9a9cbbb2e39cdb81cd9
Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 472e349..9eb96fb2 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -97,8 +97,8 @@ void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev)
struct virtio_gpu_vbuffer *vbuf;
vbuf = kmem_cache_alloc(vgdev->vbufs, GFP_KERNEL);
- if (IS_ERR(vbuf))
- return ERR_CAST(vbuf);
+ if (!vbuf)
+ return ERR_PTR(-ENOMEM);
memset(vbuf, 0, VBUFFER_SIZE);
BUG_ON(size > MAX_INLINE_CMD_SIZE);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: virtio: fix kmem_cache_alloc error check
2017-03-13 8:22 [PATCH] drm: virtio: fix kmem_cache_alloc error check Gerd Hoffmann
@ 2017-03-13 10:24 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2017-03-13 10:24 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: dri-devel, open list, open list:VIRTIO GPU DRIVER
On Mon, Mar 13, 2017 at 09:22:26AM +0100, Gerd Hoffmann wrote:
> kmem_cache_alloc returns NULL on error, not ERR_PTR.
>
> Fixes: f5985bf9cadd4e3ed8d5d9a9cbbb2e39cdb81cd9
> Reported-by: Jiri Slaby <jslaby@suse.cz>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
I guess we should have smatch integrated into 0day to catch these ...
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
> index 472e349..9eb96fb2 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_vq.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
> @@ -97,8 +97,8 @@ void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev)
> struct virtio_gpu_vbuffer *vbuf;
>
> vbuf = kmem_cache_alloc(vgdev->vbufs, GFP_KERNEL);
> - if (IS_ERR(vbuf))
> - return ERR_CAST(vbuf);
> + if (!vbuf)
> + return ERR_PTR(-ENOMEM);
> memset(vbuf, 0, VBUFFER_SIZE);
>
> BUG_ON(size > MAX_INLINE_CMD_SIZE);
> --
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-13 10:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-13 8:22 [PATCH] drm: virtio: fix kmem_cache_alloc error check Gerd Hoffmann
2017-03-13 10:24 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).