All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 2/7] tests/unit/socket-helpers: Don't close(-1)
Date: Mon, 25 Mar 2024 12:35:45 +0000	[thread overview]
Message-ID: <20240325123550.1991693-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20240325123550.1991693-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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20240312183810.557768-3-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-25 12:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-25 12:35 [PULL 0/7] target-arm queue Peter Maydell
2024-03-25 12:35 ` [PULL 1/7] tests/qtest/npcm7xx_emc_test: Don't leak cmd_line Peter Maydell
2024-03-25 12:35 ` Peter Maydell [this message]
2024-03-25 12:35 ` [PULL 3/7] net/af-xdp.c: Don't leak sock_fds array in net_init_af_xdp() Peter Maydell
2024-03-25 12:35 ` [PULL 4/7] hw/misc/pca9554: Correct error check bounds in get/set pin functions Peter Maydell
2024-03-25 12:35 ` [PULL 5/7] hw/nvram/mac_nvram: Report failure to write data Peter Maydell
2024-03-25 12:35 ` [PULL 6/7] tests/unit/test-throttle: Avoid unintended integer division Peter Maydell
2024-03-25 12:35 ` [PULL 7/7] tests/qtest/libqtest.c: Check for g_setenv() failure Peter Maydell

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=20240325123550.1991693-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.