kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-29 00:11:16 +01:00
Code Releases Activity

gnrc_rpl: harden validation routine for options

Browse Source
This commit is contained in:
Cenk Gündoğan 2021-02-23 18:50:57 +01:00
parent afb027852d
commit 72337ebb9b
No known key found for this signature in database
GPG Key ID: A3DBC2F744D484D2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/gnrc/routing/rpl/gnrc_rpl_validation.c
View File

@ -33,12 +33,17 @@ bool gnrc_rpl_validation_options(int msg_type, gnrc_rpl_instance_t *inst,
uint16_t expected_len = 0;
while(expected_len < len) {
switch(opt->type) {
case (GNRC_RPL_OPT_PAD1):
expected_len += 1;
opt = (gnrc_rpl_opt_t *) (((uint8_t *) opt) + 1);
continue;
if (opt->type == GNRC_RPL_OPT_PAD1) {
expected_len += 1;
opt = (gnrc_rpl_opt_t *) (((uint8_t *) opt) + 1);
continue;
}
if ((expected_len + sizeof(gnrc_rpl_opt_t)) > len) {
break;
}
switch(opt->type) {
case (GNRC_RPL_OPT_DODAG_CONF):
if (msg_type != GNRC_RPL_ICMPV6_CODE_DIO) {
DEBUG("RPL: DODAG CONF DIO option not expected\n");
@ -101,6 +106,11 @@ bool gnrc_rpl_validation_options(int msg_type, gnrc_rpl_instance_t *inst,
}
expected_len += opt->length + sizeof(gnrc_rpl_opt_t);
if (expected_len >= len) {
break;
}
opt = (gnrc_rpl_opt_t *) (((uint8_t *) (opt + 1)) + opt->length);
}