diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c index 1cd5c1988bc67c9bdbedf09f9bff9582c8998a03..acea7db365034db6d474c4feb649b70be66579d1 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c +++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c @@ -272,6 +272,8 @@ void _nib_nc_remove(_nib_onl_entry_t *node) entry->pkt = NULL; } #endif /* GNRC_IPV6_NIB_CONF_QUEUE_PKT */ + /* remove from cache-out procedure */ + clist_remove(&_next_removable, (clist_node_t *)node); _nib_onl_clear(node); } diff --git a/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-internal.c b/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-internal.c index 3803f10a3354f54c1b178709d6713fa368fe96f4..be6e75d6836e93e59dccd54230cbf138f3a45d1d 100644 --- a/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-internal.c +++ b/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-internal.c @@ -302,6 +302,10 @@ static void test_nib_iter__three_elem_middle_removed(void) addr.u64[1].u64++; TEST_ASSERT_NOT_NULL((node3 = _nib_onl_alloc(&addr, IFACE))); node3->mode = _DRL; + /* cppcheck-suppress redundantAssignment + * (reason: we assigned _FT before so _nib_onl_alloc would recognize node2 + * as used, now we want to clear it, so we need to set it to + * _EMPTY... we are testing internals of data structures here) */ node2->mode = _EMPTY; TEST_ASSERT(_nib_onl_clear(node2)); TEST_ASSERT_NOT_NULL((res = _nib_onl_iter(NULL))); @@ -492,6 +496,40 @@ static void test_nib_nc_add__success_full_but_garbage_collectible(void) } } +/* + * Creates GNRC_IPV6_NIB_NUMOF neighbor cache entries with different IP + * addresses and a garbage-collectible AR state and then tries to add + * 3 more after removing two. + * Expected result: should not crash + * + * See https://github.com/RIOT-OS/RIOT/pull/10975 + */ +static void test_nib_nc_add__cache_out_crash(void) +{ + _nib_onl_entry_t *node1, *node2; + ipv6_addr_t addr = { .u64 = { { .u8 = GLOBAL_PREFIX }, + { .u64 = TEST_UINT64 } } }; + + for (int i = 0; i < GNRC_IPV6_NIB_NUMOF - 2; i++) { + TEST_ASSERT_NOT_NULL(_nib_nc_add(&addr, IFACE, + GNRC_IPV6_NIB_NC_INFO_NUD_STATE_STALE)); + addr.u64[1].u64++; + } + TEST_ASSERT_NOT_NULL((node1 = _nib_nc_add(&addr, IFACE, + GNRC_IPV6_NIB_NC_INFO_NUD_STATE_STALE))); + addr.u64[1].u64++; + TEST_ASSERT_NOT_NULL((node2 = _nib_nc_add(&addr, IFACE, + GNRC_IPV6_NIB_NC_INFO_NUD_STATE_STALE))); + addr.u64[1].u64++; + _nib_nc_remove(node1); + _nib_nc_remove(node2); + for (int i = 0; i < 3; i++) { + TEST_ASSERT_NOT_NULL(_nib_nc_add(&addr, IFACE, + GNRC_IPV6_NIB_NC_INFO_NUD_STATE_STALE)); + addr.u64[1].u64++; + } +} + /* * Creates a neighbor cache entry and sets it reachable * Expected result: node->info flags set to NUD_STATE_REACHABLE and NIB's event @@ -1935,6 +1973,7 @@ Test *tests_gnrc_ipv6_nib_internal_tests(void) new_TestFixture(test_nib_nc_add__success_duplicate), new_TestFixture(test_nib_nc_add__success), new_TestFixture(test_nib_nc_add__success_full_but_garbage_collectible), + new_TestFixture(test_nib_nc_add__cache_out_crash), new_TestFixture(test_nib_nc_remove__uncleared), new_TestFixture(test_nib_nc_remove__cleared), new_TestFixture(test_nib_nc_set_reachable__success),