From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 23 May 2011 07:08:01 +0000 (+0200)
Subject: storage: pick return value of qemu-img
X-Git-Tag: CVE-2011-2178~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7b2679253504d6defa9fc7159b572cfd6a25a95;p=thirdparty%2Flibvirt.git

storage: pick return value of qemu-img

qemu-img returns non-zero status on -h. Therefore we need to
provide virCommandRun() a non-NULL exit status pointer.
---

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index f90425a221..c8e19c8a8c 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -621,13 +621,14 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg)
     char *end;
     char *tmp;
     int ret = -1;
+    int exitstatus;
     virCommandPtr cmd = virCommandNewArgList(qemuimg, "-h", NULL);
 
     virCommandAddEnvString(cmd, "LC_ALL=C");
     virCommandSetOutputBuffer(cmd, &help);
     virCommandClearCaps(cmd);
 
-    if (virCommandRun(cmd, NULL) < 0)
+    if (virCommandRun(cmd, &exitstatus) < 0)
         goto cleanup;
 
     start = strstr(help, " create ");