]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
iscsi: fix segfault in url parsing
authorPeter Lieven <pl@dlhnet.de>
Thu, 15 Nov 2012 14:42:06 +0000 (15:42 +0100)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 3 Dec 2012 21:02:28 +0000 (15:02 -0600)
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>
block/iscsi.c

index fb001b955c5f42e72a57363141196f1dd3a48f6d..817196a0728d3cfbc2561ec61bcad1129b68ad72 100644 (file)
@@ -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;
     }