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

gnrc_rpl: fix abandoned packet bug in transit option build

Browse Source 
Due to the transit option build function being passed a NULL pointer,
the previous transit and target options are dropped (and never freed).

This fixes #8098 and #8126.
This commit is contained in:
Martine Lenders 2017-11-23 17:03:02 +01:00
parent 6df40262ca
commit ec02458c55
No known key found for this signature in database
GPG Key ID: 8E97A9FE55F25D62
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/gnrc/routing/rpl/gnrc_rpl_control_messages.c
View File

@ -746,11 +746,10 @@ void gnrc_rpl_send_DAO(gnrc_rpl_instance_t *inst, ipv6_addr_t *destination, uint
while(gnrc_ipv6_nib_ft_iter(NULL, dodag->iface, &ft_state, &fte)) {
DEBUG("RPL: Send DAO - building transit option\n");
if ((pkt = _dao_transit_build(NULL, lifetime, false)) == NULL) {
if ((pkt = _dao_transit_build(pkt, lifetime, false)) == NULL) {
DEBUG("RPL: Send DAO - no space left in packet buffer\n");
return;
}
if (ipv6_addr_is_global(&fte.dst)) {
DEBUG("RPL: Send DAO - building target %s/%d\n",
ipv6_addr_to_str(addr_str, &fte.dst, sizeof(addr_str)), fte.dst_len);
@ -759,7 +758,6 @@ void gnrc_rpl_send_DAO(gnrc_rpl_instance_t *inst, ipv6_addr_t *destination, uint
DEBUG("RPL: Send DAO - no space left in packet buffer\n");
return;
}
}
}