| Message ID | 20230609072748.4179873-4-lvivier@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: socket: do not close file descriptor if it's not a socket | expand |
On Fri, 9 Jun 2023 09:27:48 +0200 Laurent Vivier <lvivier@redhat.com> wrote: > Move the file descriptor type checking before doing anything with it. > If it's not usable, don't close it as it could be in use by another > part of QEMU, only fail and report an error. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > net/socket.c | 43 +++++++++++++++++-------------------------- > 1 file changed, 17 insertions(+), 26 deletions(-) > > diff --git a/net/socket.c b/net/socket.c > index 6b1f0fec3a10..8e3702e1f3a8 100644 > --- a/net/socket.c > +++ b/net/socket.c > @@ -463,28 +463,6 @@ static int net_socket_fd_check(int fd, Error **errp) > return so_type; > } > > -static NetSocketState *net_socket_fd_init(NetClientState *peer, > - const char *model, const char *name, > - int fd, int is_connected, > - const char *mc, Error **errp) > -{ > - int so_type; > - > - so_type = net_socket_fd_check(fd, errp); > - if (so_type < 0) { > - close(fd); > - return NULL; > - } > - switch(so_type) { > - case SOCK_DGRAM: > - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, > - mc, errp); > - case SOCK_STREAM: > - return net_socket_fd_init_stream(peer, model, name, fd, is_connected); > - } > - return NULL; > -} > - > static void net_socket_accept(void *opaque) > { > NetSocketState *s = opaque; > @@ -728,21 +706,34 @@ int net_init_socket(const Netdev *netdev, const char *name, > } > > if (sock->fd) { > - int fd, ret; > + int fd, ret, so_type; > > fd = monitor_fd_param(monitor_cur(), sock->fd, errp); > if (fd == -1) { > return -1; > } > + so_type = net_socket_fd_check(fd, errp); > + if (so_type < 0) { > + return -1; > + } > ret = qemu_socket_try_set_nonblock(fd); > if (ret < 0) { > error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d", > name, fd); > return -1; > } > - if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast, > - errp)) { > - return -1; > + switch (so_type) { > + case SOCK_DGRAM: > + if (!net_socket_fd_init_dgram(peer, "socket", name, fd, 1, > + sock->mcast, errp)) { > + return -1; > + } > + break; > + case SOCK_STREAM: > + if (!net_socket_fd_init_stream(peer, "socket", name, fd, 1)) { > + return -1; > + } > + break; > } > return 0; > } > -- > 2.39.2 >
diff --git a/net/socket.c b/net/socket.c index 6b1f0fec3a10..8e3702e1f3a8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -463,28 +463,6 @@ static int net_socket_fd_check(int fd, Error **errp) return so_type; } -static NetSocketState *net_socket_fd_init(NetClientState *peer, - const char *model, const char *name, - int fd, int is_connected, - const char *mc, Error **errp) -{ - int so_type; - - so_type = net_socket_fd_check(fd, errp); - if (so_type < 0) { - close(fd); - return NULL; - } - switch(so_type) { - case SOCK_DGRAM: - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, - mc, errp); - case SOCK_STREAM: - return net_socket_fd_init_stream(peer, model, name, fd, is_connected); - } - return NULL; -} - static void net_socket_accept(void *opaque) { NetSocketState *s = opaque; @@ -728,21 +706,34 @@ int net_init_socket(const Netdev *netdev, const char *name, } if (sock->fd) { - int fd, ret; + int fd, ret, so_type; fd = monitor_fd_param(monitor_cur(), sock->fd, errp); if (fd == -1) { return -1; } + so_type = net_socket_fd_check(fd, errp); + if (so_type < 0) { + return -1; + } ret = qemu_socket_try_set_nonblock(fd); if (ret < 0) { error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d", name, fd); return -1; } - if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast, - errp)) { - return -1; + switch (so_type) { + case SOCK_DGRAM: + if (!net_socket_fd_init_dgram(peer, "socket", name, fd, 1, + sock->mcast, errp)) { + return -1; + } + break; + case SOCK_STREAM: + if (!net_socket_fd_init_stream(peer, "socket", name, fd, 1)) { + return -1; + } + break; } return 0; }
Move the file descriptor type checking before doing anything with it. If it's not usable, don't close it as it could be in use by another part of QEMU, only fail and report an error. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- net/socket.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-)