diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-08-14 13:18:01 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-08-30 04:48:56 +0200 |
| commit | 032593487f750b60f51462c4f5133ccdbbe1f78f (patch) | |
| tree | 7fac39cc98bdf2cac5beef957cebd099868f4de5 /ctdb/common | |
| parent | b430a1ace69bcef3336907557ab5bf04271c1110 (diff) | |
| download | samba-032593487f750b60f51462c4f5133ccdbbe1f78f.tar.gz | |
ctdb-common: Fix CID 1414745 - Out-of-bounds access
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/common')
| -rw-r--r-- | ctdb/common/system_socket.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c index 4a7a8c8c464..2ad0dbf6f7a 100644 --- a/ctdb/common/system_socket.c +++ b/ctdb/common/system_socket.c @@ -177,6 +177,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface) struct ip6_hdr *ip6; struct nd_neighbor_advert *nd_na; struct nd_opt_hdr *nd_oh; + struct ether_addr *ea; struct ifreq if_hwaddr; /* Size of IPv6 neighbor advertisement (with option) */ unsigned char buffer[sizeof(struct ether_header) + @@ -361,7 +362,9 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface) nd_oh = (struct nd_opt_hdr *)(nd_na+1); nd_oh->nd_opt_type = ND_OPT_TARGET_LINKADDR; nd_oh->nd_opt_len = 1; - memcpy(&(nd_oh+1)[0], if_hwaddr.ifr_hwaddr.sa_data, ETH_ALEN); + + ea = (struct ether_addr *)(nd_oh+1); + memcpy(ea, if_hwaddr.ifr_hwaddr.sa_data, ETH_ALEN); nd_na->nd_na_cksum = ip6_checksum((uint16_t *)nd_na, ntohs(ip6->ip6_plen), ip6); |