diff options
| author | Andreas Schneider <asn@samba.org> | 2014-01-28 11:30:20 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-01-28 13:24:06 +0100 |
| commit | 3ab00f5deaefa2dbdac9ba71841e178a78988dd2 (patch) | |
| tree | 2a3a854e2d03034c9a487cb8b089c2f9be08ccf1 /src | |
| parent | de94be7e4b83283f3b46320706fef19b8203b52c (diff) | |
| download | socket_wrapper-3ab00f5deaefa2dbdac9ba71841e178a78988dd2.tar.gz socket_wrapper-3ab00f5deaefa2dbdac9ba71841e178a78988dd2.tar.xz socket_wrapper-3ab00f5deaefa2dbdac9ba71841e178a78988dd2.zip | |
src: Handle stale fds in swrap_sendmsg_after().
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket_wrapper.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 0bfa838..c238559 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -2814,7 +2814,8 @@ static ssize_t swrap_sendmsg_before(int fd, return 0; } -static void swrap_sendmsg_after(struct socket_info *si, +static void swrap_sendmsg_after(int fd, + struct socket_info *si, struct msghdr *msg, const struct sockaddr *to, ssize_t ret) @@ -2827,8 +2828,13 @@ static void swrap_sendmsg_after(struct socket_info *si, size_t remain; /* to give better errors */ - if (ret == -1 && saved_errno == ENOENT) { - saved_errno = EHOSTUNREACH; + if (ret == -1) { + if (saved_errno == ENOENT) { + saved_errno = EHOSTUNREACH; + } else if (saved_errno == ENOTSOCK) { + /* If the fd is not a socket, remove it */ + swrap_remove_stale(fd); + } } for (i = 0; i < (size_t)msg->msg_iovlen; i++) { @@ -3229,7 +3235,7 @@ static ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, (struct sockaddr *)msg.msg_name, msg.msg_namelen); - swrap_sendmsg_after(si, &msg, to, ret); + swrap_sendmsg_after(s, si, &msg, to, ret); return ret; } @@ -3396,7 +3402,7 @@ static ssize_t swrap_send(int s, const void *buf, size_t len, int flags) ret = libc_send(s, buf, len, flags); - swrap_sendmsg_after(si, &msg, NULL, ret); + swrap_sendmsg_after(s, si, &msg, NULL, ret); return ret; } @@ -3556,7 +3562,7 @@ static ssize_t swrap_sendmsg(int s, const struct msghdr *omsg, int flags) ret = libc_sendmsg(s, &msg, flags); - swrap_sendmsg_after(si, &msg, to, ret); + swrap_sendmsg_after(s, si, &msg, to, ret); return ret; } @@ -3663,7 +3669,7 @@ static ssize_t swrap_writev(int s, const struct iovec *vector, int count) ret = libc_writev(s, msg.msg_iov, msg.msg_iovlen); - swrap_sendmsg_after(si, &msg, NULL, ret); + swrap_sendmsg_after(s, si, &msg, NULL, ret); return ret; } |