qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 2/7] tests/unit/socket-helpers: Don't close(-1)
Date: Tue, 12 Mar 2024 18:38:05 +0000	[thread overview]
Message-ID: <20240312183810.557768-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20240312183810.557768-1-peter.maydell@linaro.org>

In socket_check_afunix_support() we call socket(PF_UNIX, SOCK_STREAM, 0)
to see if it works, but we call close() on the result whether it
worked or not. Only close the fd if the socket() call succeeded.
Spotted by Coverity.

Resolves: Coverity CID 1497481

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tests/unit/socket-helpers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
index 6de27baee2e..f3439cc4e52 100644
--- a/tests/unit/socket-helpers.c
+++ b/tests/unit/socket-helpers.c
@@ -160,7 +160,6 @@ void socket_check_afunix_support(bool *has_afunix)
     int fd;
 
     fd = socket(PF_UNIX, SOCK_STREAM, 0);
-    close(fd);
 
 #ifdef _WIN32
     *has_afunix = (fd != (int)INVALID_SOCKET);
@@ -168,5 +167,8 @@ void socket_check_afunix_support(bool *has_afunix)
     *has_afunix = (fd >= 0);
 #endif
 
+    if (*has_afunix) {
+        close(fd);
+    }
     return;
 }
-- 
2.34.1



  parent reply	other threads:[~2024-03-12 18:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-12 18:38 [PATCH 0/7] various: 7 minor Coverity fixes Peter Maydell
2024-03-12 18:38 ` [PATCH 1/7] tests/qtest/npcm7xx_emc_test: Don't leak cmd_line Peter Maydell
2024-03-12 19:23   ` Thomas Huth
2024-03-13  6:52   ` Thomas Huth
2024-03-12 18:38 ` Peter Maydell [this message]
2024-03-22 11:51   ` [PATCH 2/7] tests/unit/socket-helpers: Don't close(-1) Thomas Huth
2024-03-12 18:38 ` [PATCH 3/7] net/af-xdp.c: Don't leak sock_fds array in net_init_af_xdp() Peter Maydell
2024-03-12 18:38 ` [PATCH 4/7] hw/misc/pca9554: Correct error check bounds in get/set pin functions Peter Maydell
2024-03-12 18:38 ` [PATCH 5/7] hw/nvram/mac_nvram: Report failure to write data Peter Maydell
2024-03-12 20:19   ` Philippe Mathieu-Daudé
2024-03-12 18:38 ` [PATCH 6/7] tests/unit/test-throttle: Avoid unintended integer division Peter Maydell
2024-03-12 19:22   ` Thomas Huth
2024-03-12 18:38 ` [PATCH 7/7] tests/qtest/libqtest.c: Check for g_setenv() failure Peter Maydell
2024-03-12 20:20   ` Philippe Mathieu-Daudé
2024-03-12 19:06 ` [PATCH 0/7] various: 7 minor Coverity fixes Richard Henderson

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=20240312183810.557768-3-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=qemu-devel@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).