qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	Stefan Berger <stefanb@linux.vnet.ibm.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [PATCH 3/6] tests/qtest/hd-geo-test: Fix checks on mkstemp() return value
Date: Tue, 25 May 2021 14:44:55 +0100	[thread overview]
Message-ID: <20210525134458.6675-4-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210525134458.6675-1-peter.maydell@linaro.org>

Coverity notices that the checks against mkstemp() failing in
create_qcow2_with_mbr() are wrong: mkstemp returns -1 on failure but
the check is just "g_assert(fd)".  Fix to use "g_assert(fd >= 0)",
matching the correct check in create_test_img().

Fixes: Coverity CID 1432274
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tests/qtest/hd-geo-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index f7b7cfbc2d1..113126ae06c 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -464,7 +464,7 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr, uint64_t sectors)
     }
 
     fd = mkstemp(raw_path);
-    g_assert(fd);
+    g_assert(fd >= 0);
     close(fd);
 
     fd = open(raw_path, O_WRONLY);
@@ -474,7 +474,7 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr, uint64_t sectors)
     close(fd);
 
     fd = mkstemp(qcow2_path);
-    g_assert(fd);
+    g_assert(fd >= 0);
     close(fd);
 
     qemu_img_path = getenv("QTEST_QEMU_IMG");
-- 
2.20.1



  parent reply	other threads:[~2021-05-25 13:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25 13:44 [PATCH 0/6] tests: Fix some minor Coverity issues Peter Maydell
2021-05-25 13:44 ` [PATCH 1/6] tests/qtest/bios-tables-test: Check for dup2() failure Peter Maydell
2021-05-25 16:15   ` Stefan Berger
2021-05-25 13:44 ` [PATCH 2/6] tests/qtest/e1000e-test: Check qemu_recv() succeeded Peter Maydell
2021-05-25 16:15   ` Stefan Berger
2021-05-25 13:44 ` Peter Maydell [this message]
2021-05-25 13:59   ` [PATCH 3/6] tests/qtest/hd-geo-test: Fix checks on mkstemp() return value Philippe Mathieu-Daudé
2021-05-25 16:14   ` Stefan Berger
2021-05-25 13:44 ` [PATCH 4/6] tests/qtest/pflash-cfi02-test: Avoid potential integer overflow Peter Maydell
2021-05-25 14:00   ` Philippe Mathieu-Daudé
2021-05-25 16:14   ` Stefan Berger
2021-05-25 13:44 ` [PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks Peter Maydell
2021-05-25 14:00   ` Philippe Mathieu-Daudé
2021-05-25 16:14   ` Stefan Berger
2021-05-25 13:44 ` [PATCH 6/6] tests/unit/test-vmstate: Assert that dup() and mkstemp() succeed Peter Maydell
2021-05-25 14:02   ` Philippe Mathieu-Daudé
2021-05-25 16:13   ` Stefan Berger

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=20210525134458.6675-4-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=thuth@redhat.com \
    /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).