summaryrefslogtreecommitdiff
path: root/libbb/udp_io.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-05-22 17:41:01 +0000
committerDenis Vlasenko2008-05-22 17:41:01 +0000
commite9b76e1f1e37f91ec9b30274594b7953f1afa6a2 (patch)
tree5343576f8522de07b5ff92a91be17b538323b396 /libbb/udp_io.c
parentae84b11467c56316a43de6146100ce22f24cf622 (diff)
downloadbusybox-e9b76e1f1e37f91ec9b30274594b7953f1afa6a2.zip
busybox-e9b76e1f1e37f91ec9b30274594b7953f1afa6a2.tar.gz
dnsd: fixes various segfaults.
One was a lib api change that was not updated and another is a stack buffer overflow. It also adds support for '*' in dnsd.conf. It resolves all hostnames to a specific ip address. This is useful if you for example want redirect all http traffic to your first-boot-web-wizard on you router/firewall. By Timo Teras
Diffstat (limited to 'libbb/udp_io.c')
-rw-r--r--libbb/udp_io.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/libbb/udp_io.c b/libbb/udp_io.c
index 689c39a..c99e516 100644
--- a/libbb/udp_io.c
+++ b/libbb/udp_io.c
@@ -36,11 +36,12 @@ send_to_from(int fd, void *buf, size_t len, int flags,
#else
struct iovec iov[1];
struct msghdr msg;
- char cbuf[sizeof(struct in_pktinfo)
+ union {
+ char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
- | sizeof(struct in6_pktinfo) /* (a|b) is poor man's max(a,b) */
+ char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
#endif
- ];
+ } u;
struct cmsghdr* cmsgptr;
if (from->sa_family != AF_INET
@@ -57,15 +58,15 @@ send_to_from(int fd, void *buf, size_t len, int flags,
iov[0].iov_base = buf;
iov[0].iov_len = len;
- memset(cbuf, 0, sizeof(cbuf));
+ memset(&u, 0, sizeof(u));
memset(&msg, 0, sizeof(msg));
msg.msg_name = (void *)(struct sockaddr *)to; /* or compiler will annoy us */
msg.msg_namelen = tolen;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- msg.msg_control = cbuf;
- msg.msg_controllen = sizeof(cbuf);
+ msg.msg_control = &u;
+ msg.msg_controllen = sizeof(u);
msg.msg_flags = flags;
cmsgptr = CMSG_FIRSTHDR(&msg);
@@ -89,6 +90,8 @@ send_to_from(int fd, void *buf, size_t len, int flags,
pktptr->ipi6_addr = ((struct sockaddr_in6*)from)->sin6_addr;
}
#endif
+ msg.msg_controllen = cmsgptr->cmsg_len;
+
return sendmsg(fd, &msg, flags);
#endif
}
@@ -109,7 +112,9 @@ recv_from_to(int fd, void *buf, size_t len, int flags,
struct iovec iov[1];
union {
char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
+#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+#endif
} u;
struct cmsghdr *cmsgptr;
struct msghdr msg;