From: Torben Nielsen Date: Thu, 6 Mar 2025 11:25:19 +0000 (+0100) Subject: tc: nat: Fix mask calculation X-Git-Tag: v6.14.0~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=667817b4c34944175deaf6ca9aa3afdf5b668fc5;p=thirdparty%2Fiproute2.git tc: nat: Fix mask calculation In parse_nat_args the network mask is calculated as sel->mask = htonl(~0u << (32 - addr.bitlen)); According to ISO/IEC 9899:TC3 6.5.7 Bitwise shift operators: The integer promotions are performed on each of the operands. The type of the result is that of the promoted left operand. If the value of the right operand is negative or is greater than or equal to the width of the promoted left operand, the behavior is undefined Specifically this means that the mask is undefined for addr.bitlen = 0 On x86_64 the result is 0xffffffff, on armv7l it is 0. Promoting the left operand of the shift operator solves this issue. Signed-off-by: Torben Nielsen Signed-off-by: Stephen Hemminger --- diff --git a/tc/m_nat.c b/tc/m_nat.c index 69d54c6f..da947aea 100644 --- a/tc/m_nat.c +++ b/tc/m_nat.c @@ -55,7 +55,7 @@ parse_nat_args(int *argc_p, char ***argv_p, struct tc_nat *sel) goto bad_val; sel->old_addr = addr.data[0]; - sel->mask = htonl(~0u << (32 - addr.bitlen)); + sel->mask = htonl(~(uint64_t)0 << (32 - addr.bitlen)); NEXT_ARG();