qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Pavel Hrdina <phrdina@redhat.com>,
	mdroth@linux.vnet.ibm.com, qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH 3/7] scsi-generic: check the return value of bdrv_aio_ioctl in execute_command
Date: Tue, 18 Jun 2013 16:16:52 +0200	[thread overview]
Message-ID: <1371565016-2643-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1371565016-2643-1-git-send-email-pbonzini@redhat.com>

From: Pavel Hrdina <phrdina@redhat.com>

This fixes the bug introduced by this commit ad54ae80c73f.
The bdrv_aio_ioctl() still could return null and we should return an error
in that case.

Cc: qemu-stable@nongnu.org
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/scsi-generic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 19bd36c..8f195be 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -174,6 +174,9 @@ static int execute_command(BlockDriverState *bdrv,
     r->io_header.flags |= SG_FLAG_DIRECT_IO;
 
     r->req.aiocb = bdrv_aio_ioctl(bdrv, SG_IO, &r->io_header, complete, r);
+    if (r->req.aiocb == NULL) {
+        return -EIO;
+    }
 
     return 0;
 }
-- 
1.8.1.4

  parent reply	other threads:[~2013-06-18 14:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 14:16 [Qemu-devel] [PULL 0/7] SCSI patches for 2013-06-18 (including 1.5.1 patches) Paolo Bonzini
2013-06-18 14:16 ` [Qemu-devel] [PATCH 1/7] scsi: reset cdrom tray statuses on scsi_disk_reset Paolo Bonzini
2013-06-18 14:16 ` [Qemu-devel] [PATCH 2/7] scsi-generic: fix sign extension of READ CAPACITY(10) data Paolo Bonzini
2013-06-18 14:16 ` Paolo Bonzini [this message]
2013-06-18 14:16 ` [Qemu-devel] [PATCH 4/7] scsi-disk: scsi-block device for scsi pass-through should not be removable Paolo Bonzini
2013-06-18 14:16 ` [Qemu-devel] [PATCH 5/7] vhost-scsi: fix k->set_guest_notifiers() NULL dereference Paolo Bonzini
2013-06-18 14:16 ` [Qemu-devel] [PATCH 6/7] iscsi: simplify freeing of tasks Paolo Bonzini
2013-06-18 14:16 ` [Qemu-devel] [PATCH 7/7] iscsi: reorganize iscsi_readcapacity_sync Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371565016-2643-4-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=phrdina@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).