diff options
author | Kevin Wolf <kwolf@redhat.com> | 2009-12-02 12:24:42 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 11:45:50 -0600 |
commit | 1e784fd7fccbab2e4c161f02d890ba304e0fdd3f (patch) | |
tree | bb44439c735a0ccc875827a8ad082b9964846d6e | |
parent | a6ecd0ff1bbf38e5bc36dd9a0ecd5d3cf4112a81 (diff) | |
download | slirp-1e784fd7fccbab2e4c161f02d890ba304e0fdd3f.zip slirp-1e784fd7fccbab2e4c161f02d890ba304e0fdd3f.tar.gz slirp-1e784fd7fccbab2e4c161f02d890ba304e0fdd3f.tar.bz2 |
Don't leak file descriptorsv0.12.1v0.12.0-rc2v0.12.0-rc1v0.12.0-rc0v0.12.0
We're leaking file descriptors to child processes. Set FD_CLOEXEC on file
descriptors that don't need to be passed to children to stop this misbehaviour.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | misc.c | 4 | ||||
-rw-r--r-- | slirp.h | 4 | ||||
-rw-r--r-- | socket.c | 2 | ||||
-rw-r--r-- | tcp_subr.c | 2 | ||||
-rw-r--r-- | udp.c | 4 |
5 files changed, 10 insertions, 6 deletions
@@ -125,7 +125,7 @@ int fork_exec(struct socket *so, const char *ex, int do_pty) addr.sin_port = 0; addr.sin_addr.s_addr = INADDR_ANY; - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0 || + if ((s = qemu_socket(AF_INET, SOCK_STREAM, 0)) < 0 || bind(s, (struct sockaddr *)&addr, addrlen) < 0 || listen(s, 1) < 0) { lprint("Error: inet socket: %s\n", strerror(errno)); @@ -158,7 +158,7 @@ int fork_exec(struct socket *so, const char *ex, int do_pty) * Connect to the socket * XXX If any of these fail, we're in trouble! */ - s = socket(AF_INET, SOCK_STREAM, 0); + s = qemu_socket(AF_INET, SOCK_STREAM, 0); addr.sin_addr = loopback_addr; do { ret = connect(s, (struct sockaddr *)&addr, addrlen); @@ -197,6 +197,10 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "bootp.h" #include "tftp.h" +/* osdep.c */ +int qemu_socket(int domain, int type, int protocol); + + struct Slirp { QTAILQ_ENTRY(Slirp) entry; @@ -632,7 +632,7 @@ struct socket *tcp_listen(Slirp *slirp, u_int32_t haddr, u_int hport, addr.sin_addr.s_addr = haddr; addr.sin_port = hport; - if (((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) || + if (((s = qemu_socket(AF_INET, SOCK_STREAM, 0)) < 0) || (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(int)) < 0) || (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) || @@ -323,7 +323,7 @@ int tcp_fconnect(struct socket *so) DEBUG_CALL("tcp_fconnect"); DEBUG_ARG("so = %lx", (long)so); - if ((ret = so->s = socket(AF_INET, SOCK_STREAM, 0)) >= 0) { + if ((ret = so->s = qemu_socket(AF_INET, SOCK_STREAM, 0)) >= 0) { int opt, s = so->s; struct sockaddr_in addr; @@ -297,7 +297,7 @@ int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *addr) int udp_attach(struct socket *so) { - if ((so->s = socket(AF_INET, SOCK_DGRAM, 0)) != -1) { + if ((so->s = qemu_socket(AF_INET, SOCK_DGRAM, 0)) != -1) { so->so_expire = curtime + SO_EXPIRE; insque(so, &so->slirp->udb); } @@ -340,7 +340,7 @@ struct socket *udp_listen(Slirp *slirp, u_int32_t haddr, u_int hport, if (!so) { return NULL; } - so->s = socket(AF_INET, SOCK_DGRAM, 0); + so->s = qemu_socket(AF_INET, SOCK_DGRAM, 0); so->so_expire = curtime + SO_EXPIRE; insque(so, &slirp->udb); |