summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Lieven <pl@dlhnet.de>2012-11-15 15:42:06 +0100
committerDoug Goldstein <cardoe@cardoe.com>2012-12-13 15:31:59 -0600
commit4f873a75224a2124e105717a913af75f9ebbce0a (patch)
tree2e25fbdf893ccc09f21af3bcd6124a73b7d909ea
parentqapi: fix qapi_dealloc_type_size parameter type (diff)
downloadqemu-kvm-4f873a75224a2124e105717a913af75f9ebbce0a.tar.gz
qemu-kvm-4f873a75224a2124e105717a913af75f9ebbce0a.tar.bz2
qemu-kvm-4f873a75224a2124e105717a913af75f9ebbce0a.zip
iscsi: fix segfault in url parsing
If an invalid URL is specified iscsi_get_error(iscsi) is called with iscsi == NULL. Signed-off-by: Peter Lieven <pl@kamp.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit 8da1e18b0cf46b6c95c88bbad1cc50d6dd1bef4b) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> (cherry picked from commit 972a2bf07287e4a9a4a7bd03d4e9af5d4259baef)
-rw-r--r--block/iscsi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/iscsi.c b/block/iscsi.c
index fb001b955..817196a07 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -951,8 +951,7 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags)
iscsi_url = iscsi_parse_full_url(iscsi, filename);
if (iscsi_url == NULL) {
- error_report("Failed to parse URL : %s %s", filename,
- iscsi_get_error(iscsi));
+ error_report("Failed to parse URL : %s", filename);
ret = -EINVAL;
goto out;
}