From de818bf610ba0fed2b275a19fe3e6f9cbfa1862b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 14 Jan 2020 16:20:56 +0100 Subject: [PATCH] n-dhcp4: fix integer context in n_dhcp4_client_probe_transition_nak() on 32 bit Fixes: 218782a9a3c3 ('n-dhcp4: restart the transaction after a NAK') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/339 --- shared/n-dhcp4/src/n-dhcp4-c-probe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c index 5bed15b8f4..f4962d6995 100644 --- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c +++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c @@ -1005,9 +1005,9 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; - probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2, - UINT64_C(1000000000 * 2), - UINT64_C(1000000000 * 300)); + probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u, + UINT64_C(2) * UINT64_C(1000000000), + UINT64_C(300) * UINT64_C(1000000000)); break; case N_DHCP4_CLIENT_PROBE_STATE_SELECTING: case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT: