properly store IPv6 addresses in struct tun_t
All addresses in struct tun_t were stored as an in_addr.
But IPv6 addresses need an in6_addr, so switch tun_t addresses
to the in64_addr wrapper struct.
This is an ABI break, as documented in TODO-RELEASE.
Fixes an out of bounds memcpy() identified by Coverity.
Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34
Related: CID#174278
diff --git a/lib/tun.c b/lib/tun.c
index 6ae006b..1aeed55 100644
--- a/lib/tun.c
+++ b/lib/tun.c
@@ -68,10 +68,14 @@
if (rc < 0)
return rc;
- if (addr)
- this->addr.s_addr = addr->s_addr;
- if (dstaddr)
- this->dstaddr.s_addr = dstaddr->s_addr;
+ if (addr) {
+ this->addr.len = sizeof(struct in_addr);
+ this->addr.v4.s_addr = addr->s_addr;
+ }
+ if (dstaddr) {
+ this->dstaddr.len = sizeof(struct in_addr);
+ this->dstaddr.v4.s_addr = dstaddr->s_addr;
+ }
if (netmask)
this->netmask.s_addr = netmask->s_addr;
this->addrs++;
@@ -89,8 +93,10 @@
rc = netdev_setaddr6(this->devname, addr, dstaddr, prefixlen);
if (rc < 0)
return rc;
- if (dstaddr)
- memcpy(&this->dstaddr, dstaddr, sizeof(*dstaddr));
+ if (dstaddr) {
+ this->dstaddr.len = sizeof(*dstaddr);
+ memcpy(&this->dstaddr.v6, dstaddr, sizeof(*dstaddr));
+ }
this->addrs++;
#if defined(__FreeBSD__) || defined (__APPLE__)
this->routes = 1;
@@ -270,7 +276,7 @@
{
if (tun->routes) {
- netdev_delroute(&tun->dstaddr, &tun->addr, &tun->netmask);
+ netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask);
}
if (tun->fd >= 0) {
@@ -323,7 +329,7 @@
char smask[TUN_ADDRSIZE];
int rc;
- strncpy(snet, inet_ntoa(tun->addr), sizeof(snet));
+ strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet));
snet[sizeof(snet) - 1] = 0;
strncpy(smask, inet_ntoa(tun->netmask), sizeof(smask));
smask[sizeof(smask) - 1] = 0;