From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 12 Oct 2021 09:50:34 +0000 (+0900)
Subject: sd-dhcp6-client: max_retransmit_time must be positive
X-Git-Tag: v250-rc1~512^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20987%2Fhead;p=thirdparty%2Fsystemd.git

sd-dhcp6-client: max_retransmit_time must be positive

Found by LGTM.com analysis.
---

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index cb05bd216ee..aacdf069807 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -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);