| Message ID | 20200323112943.12010-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio,vhost-gpu: Release memory returned by malloc() with free() | expand |
On Mon, Mar 23, 2020 at 12:29 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > vu_queue_pop() returns memory that must be freed with free(). > > Cc: qemu-stable@nongnu.org > Reported-by: Coverity (CID 1421887 ALLOC_FREE_MISMATCH) > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > contrib/vhost-user-gpu/vhost-user-gpu.c | 4 ++-- > contrib/vhost-user-gpu/virgl.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c > index b45d2019b4..a019d0a9ac 100644 > --- a/contrib/vhost-user-gpu/vhost-user-gpu.c > +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c > @@ -848,7 +848,7 @@ vg_handle_ctrl(VuDev *dev, int qidx) > QTAILQ_INSERT_TAIL(&vg->fenceq, cmd, next); > vg->inflight++; > } else { > - g_free(cmd); > + free(cmd); > } > } > } > @@ -939,7 +939,7 @@ vg_handle_cursor(VuDev *dev, int qidx) > } > vu_queue_push(dev, vq, elem, 0); > vu_queue_notify(dev, vq); > - g_free(elem); > + free(elem); > } > } > > diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c > index 43413e29df..b0bc22c3c1 100644 > --- a/contrib/vhost-user-gpu/virgl.c > +++ b/contrib/vhost-user-gpu/virgl.c > @@ -519,7 +519,7 @@ virgl_write_fence(void *opaque, uint32_t fence) > g_debug("FENCE %" PRIu64, cmd->cmd_hdr.fence_id); > vg_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); > QTAILQ_REMOVE(&g->fenceq, cmd, next); > - g_free(cmd); > + free(cmd); > g->inflight--; > } > } > -- > 2.21.1 >
On Mon, 23 Mar 2020 at 11:29, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > vu_queue_pop() returns memory that must be freed with free(). > > Cc: qemu-stable@nongnu.org > Reported-by: Coverity (CID 1421887 ALLOC_FREE_MISMATCH) > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > contrib/vhost-user-gpu/vhost-user-gpu.c | 4 ++-- > contrib/vhost-user-gpu/virgl.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied this patch (and not any of the rest of the series) to master for rc3, thanks. -- PMM
diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c index b45d2019b4..a019d0a9ac 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -848,7 +848,7 @@ vg_handle_ctrl(VuDev *dev, int qidx) QTAILQ_INSERT_TAIL(&vg->fenceq, cmd, next); vg->inflight++; } else { - g_free(cmd); + free(cmd); } } } @@ -939,7 +939,7 @@ vg_handle_cursor(VuDev *dev, int qidx) } vu_queue_push(dev, vq, elem, 0); vu_queue_notify(dev, vq); - g_free(elem); + free(elem); } } diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index 43413e29df..b0bc22c3c1 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -519,7 +519,7 @@ virgl_write_fence(void *opaque, uint32_t fence) g_debug("FENCE %" PRIu64, cmd->cmd_hdr.fence_id); vg_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); QTAILQ_REMOVE(&g->fenceq, cmd, next); - g_free(cmd); + free(cmd); g->inflight--; } }
vu_queue_pop() returns memory that must be freed with free(). Cc: qemu-stable@nongnu.org Reported-by: Coverity (CID 1421887 ALLOC_FREE_MISMATCH) Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- contrib/vhost-user-gpu/vhost-user-gpu.c | 4 ++-- contrib/vhost-user-gpu/virgl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)