interface-ip: clear host bits of the device prefix
authorHans Dedecker <dedeckeh@gmail.com>
Sun, 9 Aug 2020 20:46:54 +0000 (22:46 +0200)
committerHans Dedecker <dedeckeh@gmail.com>
Mon, 10 Aug 2020 19:20:52 +0000 (21:20 +0200)
Clear the host bits of the device prefix in
interface_ip_add_device_prefix as interface_set_prefix_address just ORs
the calculated assignment part which would lead to an invalid IPv6
address if the host bits are not masked out

Suggested-by: Daniel Gröber <dxld@darkboxed.org>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
interface-ip.c

index 2e46f142452212ffa54a23751600178394bb9abc..f1ed8d39cad1b3a2b2a90b47326fd50e608fb85c 100644 (file)
@@ -1270,6 +1270,8 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
                uint8_t length, time_t valid_until, time_t preferred_until,
                struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass)
 {
+       union if_addr a = { .in6 = *addr };
+
        if (!pclass)
                pclass = (iface) ? iface->name : "local";
 
@@ -1277,8 +1279,10 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
        if (!prefix)
                return NULL;
 
+       clear_if_addr(&a, length);
+
        prefix->length = length;
-       prefix->addr = *addr;
+       prefix->addr = a.in6;
        prefix->preferred_until = preferred_until;
        prefix->valid_until = valid_until;
        prefix->iface = iface;