From: Ilya Leoshkevich <iii@linux.ibm.com>
To: "Warner Losh" <imp@bsdimp.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: "Kyle Evans" <kevans@freebsd.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-devel@nongnu.org, "Ilya Leoshkevich" <iii@linux.ibm.com>
Subject: [PATCH v4 3/9] gdbstub: Try unlinking the unix socket before binding
Date: Wed, 8 Jan 2025 21:04:58 +0100 [thread overview]
Message-ID: <20250108202625.149869-4-iii@linux.ibm.com> (raw)
In-Reply-To: <20250108202625.149869-1-iii@linux.ibm.com>
In case an emulated process execve()s another emulated process, bind()
will fail, because the socket already exists. So try deleting it. Use
the existing unix_listen() function which does this.
Note that it is not possible to handle this in do_execv(): deleting
gdbserver_user_state.socket_path before safe_execve() is not correct,
because the latter may fail, and afterwards we may lose control.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
gdbstub/user.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/gdbstub/user.c b/gdbstub/user.c
index ef52f249ce9..2c500eb1e23 100644
--- a/gdbstub/user.c
+++ b/gdbstub/user.c
@@ -10,6 +10,7 @@
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qemu/bitops.h"
#include "qemu/cutils.h"
#include "qemu/sockets.h"
@@ -317,9 +318,9 @@ static bool gdb_accept_socket(int gdb_fd)
static int gdbserver_open_socket(const char *path)
{
g_autoptr(GString) buf = g_string_new("");
- struct sockaddr_un sockaddr = {};
char *pid_placeholder;
- int fd, ret;
+ Error *err = NULL;
+ int fd;
pid_placeholder = strstr(path, "%d");
if (pid_placeholder != NULL) {
@@ -329,24 +330,9 @@ static int gdbserver_open_socket(const char *path)
path = buf->str;
}
- fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ fd = unix_listen(path, &err);
if (fd < 0) {
- perror("create socket");
- return -1;
- }
-
- sockaddr.sun_family = AF_UNIX;
- pstrcpy(sockaddr.sun_path, sizeof(sockaddr.sun_path) - 1, path);
- ret = bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
- if (ret < 0) {
- perror("bind socket");
- close(fd);
- return -1;
- }
- ret = listen(fd, 1);
- if (ret < 0) {
- perror("listen socket");
- close(fd);
+ warn_report_err(err);
return -1;
}
--
2.47.1
next prev parent reply other threads:[~2025-01-08 20:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 20:04 [PATCH v4 0/9] gdbstub: Allow late attachment Ilya Leoshkevich
2025-01-08 20:04 ` [PATCH v4 1/9] qapi: Make qapi_bool_parse() gracefully handle NULL value Ilya Leoshkevich
2025-01-10 11:33 ` Daniel P. Berrangé
2025-01-10 13:03 ` Ilya Leoshkevich
2025-01-10 13:32 ` Daniel P. Berrangé
2025-01-08 20:04 ` [PATCH v4 2/9] gdbstub: Allow the %d placeholder in the socket path Ilya Leoshkevich
2025-01-08 20:04 ` Ilya Leoshkevich [this message]
2025-01-08 20:04 ` [PATCH v4 4/9] user: Introduce user/signal.h Ilya Leoshkevich
2025-01-08 20:05 ` [PATCH v4 5/9] user: Introduce host_interrupt_signal Ilya Leoshkevich
2025-01-08 20:05 ` [PATCH v4 6/9] osdep: Introduce qemu_kill_thread() Ilya Leoshkevich
2025-01-08 20:05 ` [PATCH v4 7/9] gdbstub: Allow late attachment Ilya Leoshkevich
2025-01-08 20:05 ` [PATCH v4 8/9] docs/user: Document the %d placeholder and suspend=n QEMU_GDB features Ilya Leoshkevich
2025-01-08 20:05 ` [PATCH v4 9/9] tests/tcg: Add late gdbstub attach test Ilya Leoshkevich
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=20250108202625.149869-4-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=alex.bennee@linaro.org \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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.