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 <torben.nielsen@prevas.dk>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tc/m_nat.c b/tc/m_nat.c
index 69d54c6ffbe5089987696bc91556ec6d291f66e7..da947aeabb3d0eb5e138835bd9b912a50c9fc0cc 100644 (file)
--- 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();