Commit 2867e1ea authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Jakub Kicinski

inet_ecn: Fix endianness of checksum update when setting ECT(1)

When adding support for propagating ECT(1) marking in IP headers it seems I
suffered from endianness-confusion in the checksum update calculation: In
fact the ECN field is in the *lower* bits of the first 16-bit word of the
IP header when calculating in network byte order. This means that the
addition performed to update the checksum field was wrong; let's fix that.

Fixes: b7237487 ("tunnel: Propagate ECT(1) when decapsulating as recommended by RFC6040")
Reported-by: default avatarJonathan Morton <chromatix99@gmail.com>
Tested-by: default avatarPete Heist <pete@heistp.net>
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20201130183705.17540-1-toke@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 06433349
...@@ -107,7 +107,7 @@ static inline int IP_ECN_set_ect1(struct iphdr *iph) ...@@ -107,7 +107,7 @@ static inline int IP_ECN_set_ect1(struct iphdr *iph)
if ((iph->tos & INET_ECN_MASK) != INET_ECN_ECT_0) if ((iph->tos & INET_ECN_MASK) != INET_ECN_ECT_0)
return 0; return 0;
check += (__force u16)htons(0x100); check += (__force u16)htons(0x1);
iph->check = (__force __sum16)(check + (check>=0xFFFF)); iph->check = (__force __sum16)(check + (check>=0xFFFF));
iph->tos ^= INET_ECN_MASK; iph->tos ^= INET_ECN_MASK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment