From: Nacho Barrientos Date: Mon, 29 Nov 2021 13:17:55 +0000 (+0100) Subject: Byte order to host before using the lifetime X-Git-Tag: v250-rc1~122 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=081f44859a3e81633418c4639e6a4bf1fd29f100;p=thirdparty%2Fsystemd.git Byte order to host before using the lifetime I've seen this in `NetworkManager-1.34.0-0.3.el8.x86_64` (latest in CentOS Stream 8 at the time of writing this message) which does not use the latest Systemd but probably the code base is the same (see https://github.com/NetworkManager/NetworkManager/commit/51f93e00a23fbd09f5ad96da6290bf4ca737d46a). Before the patch: ``` libsystemd: eth0: DHCPv6 client: T1 expires in 34y 3w 6d 45min 31s libsystemd: eth0: DHCPv6 client: T2 expires in 54y 5month 3w 3d 23h 20min 35s ``` After the patch: ``` libsystemd: eth0: DHCPv6 client: T1 expires in 3d 7h 58min 3s libsystemd: eth0: DHCPv6 client: T2 expires in 5d 2h 26min 50s ``` same box (x86_64 system) and same DHCPv6 server. This regression has likely been introduced by 8a8955507af363c31297bbc5df79852db4ad39d6. --- diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index 42792d1d2fc..28fe036a409 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -817,7 +817,7 @@ int dhcp6_option_parse_ia( /* Ignore the sub-option on non-critical errors. */ continue; - lt_min = MIN(lt_min, a->iaaddr.lifetime_valid); + lt_min = MIN(lt_min, be32toh(a->iaaddr.lifetime_valid)); LIST_PREPEND(addresses, ia.addresses, a); break; } @@ -836,7 +836,7 @@ int dhcp6_option_parse_ia( /* Ignore the sub-option on non-critical errors. */ continue; - lt_min = MIN(lt_min, a->iapdprefix.lifetime_valid); + lt_min = MIN(lt_min, be32toh(a->iapdprefix.lifetime_valid)); LIST_PREPEND(addresses, ia.addresses, a); break; }