diff mbox

[2/2] virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path

Message ID 1400255046-24481-3-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster May 16, 2014, 3:44 p.m. UTC 
Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/scsi/virtio-scsi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Paolo Bonzini May 16, 2014, 3:52 p.m. UTC | #1 
Il 16/05/2014 17:44, Markus Armbruster ha scritto:
> Spotted by Coverity.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/scsi/virtio-scsi.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index 1752193..14261fb 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -498,7 +498,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
>                                     uint32_t event, uint32_t reason)
>  {
>      VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
> -    VirtIOSCSIReq *req = virtio_scsi_pop_req(s, vs->event_vq);
> +    VirtIOSCSIReq *req;
>      VirtIOSCSIEvent *evt;
>      VirtIODevice *vdev = VIRTIO_DEVICE(s);
>      int in_size;
> @@ -507,6 +507,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
>          return;
>      }
>
> +    req = virtio_scsi_pop_req(s, vs->event_vq);
>      if (!req) {
>          s->events_dropped = true;
>          return;
>

Cc: qemu-stable@nongnu.org
diff mbox

Patch

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 1752193..14261fb 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -498,7 +498,7 @@  static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
                                    uint32_t event, uint32_t reason)
 {
     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
-    VirtIOSCSIReq *req = virtio_scsi_pop_req(s, vs->event_vq);
+    VirtIOSCSIReq *req;
     VirtIOSCSIEvent *evt;
     VirtIODevice *vdev = VIRTIO_DEVICE(s);
     int in_size;
@@ -507,6 +507,7 @@  static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
         return;
     }
 
+    req = virtio_scsi_pop_req(s, vs->event_vq);
     if (!req) {
         s->events_dropped = true;
         return;