motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-26 20:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gdbstub: Try unlinking the unix socket before binding

Browse source 
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. Link qemu-user
with qemu-sockets.c and add the monitor_get_fd() stub.

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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250117001542.8290-3-iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250207153112.3939799-12-alex.bennee@linaro.org>
This commit is contained in:
Ilya Leoshkevich 2025-02-07 15:31:06 +00:00 • committed by Alex Bennée
parent 9853485dd4
commit fccb744f41
4 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gdbstub/user.c
View file

@ -315,12 +315,10 @@ static bool gdb_accept_socket(int gdb_fd)
return true;
}
static int gdbserver_open_socket(const char *path)
static int gdbserver_open_socket(const char *path, Error **errp)
{
g_autoptr(GString) buf = g_string_new("");
struct sockaddr_un sockaddr = {};
char *pid_placeholder;
int fd, ret;
pid_placeholder = strstr(path, "%d");
if (pid_placeholder != NULL) {
@ -330,28 +328,7 @@ static int gdbserver_open_socket(const char *path)
path = buf->str;
}
fd = socket(AF_UNIX, SOCK_STREAM, 0);
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);
return -1;
}
return fd;
return unix_listen(path, errp);
}
static bool gdb_accept_tcp(int gdb_fd)
@ -424,7 +401,7 @@ bool gdbserver_start(const char *port_or_path, Error **errp)
if (port > 0) {
gdb_fd = gdbserver_open_port(port, errp);
} else {
gdb_fd = gdbserver_open_socket(port_or_path);
gdb_fd = gdbserver_open_socket(port_or_path, errp);
}
if (gdb_fd < 0) {