Fix UBSAN warnings in linux/device.c.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index ffc82a6..17dd39e 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -83,7 +83,7 @@ static uint32_t hash_function_ipv6_t(const ipv6_t *p) {
        uint32_t hash = hash_seed;
 
        for(int i = 0; i < 4; i++) {
-               hash += fullwidth[i];
+               hash = wrapping_add32(hash, fullwidth[i]);
                hash = wrapping_mul32(hash, 0x9e370001U);
        }
 
@@ -95,7 +95,7 @@ static uint32_t hash_function_mac_t(const mac_t *p) {
        uint32_t hash = hash_seed;
 
        for(int i = 0; i < 3; i++) {
-               hash += halfwidth[i];
+               hash = wrapping_add32(hash, halfwidth[i]);
                hash = wrapping_mul32(hash, 0x9e370001U);
        }
 
@@ -129,6 +129,9 @@ void subnet_cache_flush_table(subnet_type_t stype) {
 
 void init_subnets(void) {
        hash_seed = (uint32_t)rand();
+
+       // tables need to be cleared on startup
+       subnet_cache_flush_tables();
 }
 
 void exit_subnets(void) {