riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc_ipv6_nib: fix duplicate handling for ARO

Browse Source 
When `nce` is NULL on the duplicate check, the later re-fetching of the
`nce` might result in an actual NCE entry that then contains a
duplicate, so we need to re-check the EUI-64 again as well.
This commit is contained in:
Martine S. Lenders 2020-08-28 13:53:30 +02:00
parent f9c3e5f5a4
commit 91dfee7ee0
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c
View File

@ -69,6 +69,21 @@ uint8_t _reg_addr_upstream(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
_handle_sl2ao(netif, ipv6, icmpv6, sl2ao); _handle_sl2ao(netif, ipv6, icmpv6, sl2ao);
/* re-get NCE in case it was updated */ /* re-get NCE in case it was updated */
nce = _nib_onl_get(&ipv6->src, netif->pid); nce = _nib_onl_get(&ipv6->src, netif->pid);
/* and re-check EUI-64 in case nce was not an NC before */
if ((memcmp(&nce->eui64, &aro->eui64,
sizeof(aro->eui64)) != 0) &&
(_get_ar_state(nce) != GNRC_IPV6_NIB_NC_INFO_AR_STATE_GC)) {
/* ignore address registration requests from upstream */
DEBUG("nib: Could not register %s, duplicate entry with "
"EUI-64 %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
ipv6_addr_to_str(addr_str, &ipv6->src,
sizeof(addr_str)),
nce->eui64.uint8[0], nce->eui64.uint8[1],
nce->eui64.uint8[2], nce->eui64.uint8[3],
nce->eui64.uint8[4], nce->eui64.uint8[5],
nce->eui64.uint8[6], nce->eui64.uint8[7]);
return SIXLOWPAN_ND_STATUS_DUP;
}
return _update_nce_ar_state(aro, nce); return _update_nce_ar_state(aro, nce);
} }
else if (nce != NULL) { else if (nce != NULL) {