From: Tom Gundersen <teg@jklm.no>
Date: Tue, 17 Nov 2015 12:14:36 +0000 (+0100)
Subject: networkd: ndisc - fix token support
X-Git-Tag: v228~2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb84d8966e5ce49b0c705768bb4da4956c4e529a;p=platform%2Fupstream%2Fsystemd.git

networkd: ndisc - fix token support

Fixes CID#1338680. Thanks to Thomas Andersen.
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 37c6ec2..a2efac7 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -75,7 +75,7 @@ static void ndisc_prefix_autonomous_handler(sd_ndisc *nd, const struct in6_addr
         address->family = AF_INET6;
         address->in_addr.in6 = *prefix;
         if (in_addr_is_null(AF_INET6, (const union in_addr_union *) &link->network->ipv6_token) == 0)
-                memcpy(&address->in_addr.in6 + 8, &link->network->ipv6_token + 8, 8);
+                memcpy(((char *)&address->in_addr.in6) + 8, ((char *)&link->network->ipv6_token) + 8, 8);
         else {
                 /* see RFC4291 section 2.5.1 */
                 address->in_addr.in6.__in6_u.__u6_addr8[8]  = link->mac.ether_addr_octet[0];