]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp6-client: max_retransmit_time must be positive 20987/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 12 Oct 2021 09:50:34 +0000 (18:50 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 12 Oct 2021 17:49:49 +0000 (02:49 +0900)
Found by LGTM.com analysis.

src/libsystemd-network/sd-dhcp6-client.c

index cb05bd216ee4391af31f38fce50e9b2e81988112..aacdf0698079d6c1e4ac7aa565abb63a2137f11e 100644 (file)
@@ -1067,8 +1067,8 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
                         client->retransmit_time += init_retransmit_time / 10;
 
         } else {
-                if (max_retransmit_time > 0 &&
-                    client->retransmit_time > max_retransmit_time / 2)
+                assert(max_retransmit_time > 0);
+                if (client->retransmit_time > max_retransmit_time / 2)
                         client->retransmit_time = client_timeout_compute_random(max_retransmit_time);
                 else
                         client->retransmit_time += client_timeout_compute_random(client->retransmit_time);