RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

gnrc_rpl_srh: check header fields consistency before substraction

Browse Source
This commit is contained in:
Martine Lenders 2022-12-23 13:50:50 +01:00 committed by Kaspar Schleiser
parent 88d1d2eb64
commit 4f1e2a3709
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/gnrc/routing/rpl/srh/gnrc_rpl_srh.c
View File

@ -74,6 +74,13 @@ int gnrc_rpl_srh_process(ipv6_hdr_t *ipv6, gnrc_rpl_srh_t *rh, void **err_ptr)
uint8_t current_pos, pref_elided, addr_len, compri_addr_len; uint8_t current_pos, pref_elided, addr_len, compri_addr_len;
const uint8_t new_seg_left = rh->seg_left - 1; const uint8_t new_seg_left = rh->seg_left - 1;
if ((rh->len * 8) < (GNRC_RPL_SRH_PADDING(rh->pad_resv) +
(16 - GNRC_RPL_SRH_COMPRE(rh->compr)))) {
DEBUG("RPL SRH: inconsistent header received\n");
*err_ptr = &rh->len;
return GNRC_IPV6_EXT_RH_ERROR;
}
assert(rh->seg_left > 0); assert(rh->seg_left > 0);
num_addr = (((rh->len * 8) - GNRC_RPL_SRH_PADDING(rh->pad_resv) - num_addr = (((rh->len * 8) - GNRC_RPL_SRH_PADDING(rh->pad_resv) -
(16 - GNRC_RPL_SRH_COMPRE(rh->compr))) / (16 - GNRC_RPL_SRH_COMPRE(rh->compr))) /

22
tests/gnrc_rpl_srh/main.c
View File

@ -120,6 +120,27 @@ static void test_rpl_srh_route_multicast(void)
TEST_ASSERT_NULL(err_ptr); TEST_ASSERT_NULL(err_ptr);
} }
static void test_rpl_srh_inconsistent_hdr(void)
{
static const ipv6_addr_t dst = IPV6_DST;
gnrc_rpl_srh_t srh;
void *err_ptr;
int res;
memset(&srh, 0, sizeof(srh));
memcpy(&hdr.dst, &dst, sizeof(hdr.dst));
srh.nh = 128U;
srh.len = 0U;
srh.type = 3U;
srh.seg_left = 220U;
srh.compr = 0xc0;
srh.pad_resv = 0xf0;
res = gnrc_rpl_srh_process(&hdr, &srh, &err_ptr);
TEST_ASSERT_EQUAL_INT(res, GNRC_IPV6_EXT_RH_ERROR);
TEST_ASSERT((&srh.len) == err_ptr);
}
static void test_rpl_srh_too_many_seg_left(void) static void test_rpl_srh_too_many_seg_left(void)
{ {
static const ipv6_addr_t a1 = IPV6_ADDR1; static const ipv6_addr_t a1 = IPV6_ADDR1;
@ -239,6 +260,7 @@ static void run_unittests(void)
EMB_UNIT_TESTFIXTURES(fixtures) { EMB_UNIT_TESTFIXTURES(fixtures) {
new_TestFixture(test_rpl_srh_dst_multicast), new_TestFixture(test_rpl_srh_dst_multicast),
new_TestFixture(test_rpl_srh_route_multicast), new_TestFixture(test_rpl_srh_route_multicast),
new_TestFixture(test_rpl_srh_inconsistent_hdr),
new_TestFixture(test_rpl_srh_too_many_seg_left), new_TestFixture(test_rpl_srh_too_many_seg_left),
new_TestFixture(test_rpl_srh_nexthop_no_prefix_elided), new_TestFixture(test_rpl_srh_nexthop_no_prefix_elided),
new_TestFixture(test_rpl_srh_nexthop_prefix_elided), new_TestFixture(test_rpl_srh_nexthop_prefix_elided),

6
tests/gnrc_rpl_srh/tests-as-root/01-run.py
View File

@ -167,7 +167,7 @@ def test_wrong_type(child, iface, hw_dst, ll_dst, ll_src):
pktbuf_empty(child) pktbuf_empty(child)
def test_seg_left_gt_len_addresses(child, iface, hw_dst, ll_dst, ll_src): def test_inconsistent_header(child, iface, hw_dst, ll_dst, ll_src):
# send routing header with no (0) addresses but segleft set to a value # send routing header with no (0) addresses but segleft set to a value
# larger than 0 # larger than 0
p = srp1(Ether(dst=hw_dst) / IPv6(dst=ll_dst, src=ll_src) / p = srp1(Ether(dst=hw_dst) / IPv6(dst=ll_dst, src=ll_src) /
@ -176,7 +176,7 @@ def test_seg_left_gt_len_addresses(child, iface, hw_dst, ll_dst, ll_src):
assert(p is not None) assert(p is not None)
assert(ICMPv6ParamProblem in p) assert(ICMPv6ParamProblem in p)
assert(p[ICMPv6ParamProblem].code == 0) # erroneous header field encountered assert(p[ICMPv6ParamProblem].code == 0) # erroneous header field encountered
assert(p[ICMPv6ParamProblem].ptr == 43) # segleft field assert(p[ICMPv6ParamProblem].ptr == 41) # len field
pktbuf_empty(child) pktbuf_empty(child)
@ -348,7 +348,7 @@ def testfunc(child):
raise e raise e
run(test_wrong_type) run(test_wrong_type)
run(test_seg_left_gt_len_addresses) run(test_inconsistent_header)
run(test_multicast_dst) run(test_multicast_dst)
run(test_multicast_addr) run(test_multicast_addr)
run(test_multiple_addrs_of_mine_uncomp) run(test_multiple_addrs_of_mine_uncomp)