[PATCH net] net/mlx4_en: Fix endianness bug in IPV6 csum calculation

Subsystems: mellanox ethernet driver (mlx4_en), mellanox mlx4 core vpi driver, networking drivers, the rest

STALE3747d REVIEWED: 2 (0M)

2 review trailers.

2 messages, 2 authors, 2016-05-06 · open the first message on its own page

[PATCH net] net/mlx4_en: Fix endianness bug in IPV6 csum calculation

From: Tariq Toukan <hidden>
Date: 2016-05-04 12:31:33

From: Daniel Jurgens <redacted>

Use htons instead of unconditionally byte swapping nexthdr.  On a little
endian systems shifting the byte is correct behavior, but it results in
incorrect csums on big endian architectures.

Fixes: f8c6455bb04b ('net/mlx4_en: Extend checksum offloading by CHECKSUM COMPLETE')
Signed-off-by: Daniel Jurgens <redacted>
Reviewed-by: Carol Soto <redacted>
Tested-by: Carol Soto <redacted>
Signed-off-by: Tariq Toukan <redacted>
---
 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index b723e3b..ca3a384 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -707,7 +707,7 @@ static int get_fixed_ipv6_csum(__wsum hw_checksum, struct sk_buff *skb,
 
 	if (ipv6h->nexthdr == IPPROTO_FRAGMENT || ipv6h->nexthdr == IPPROTO_HOPOPTS)
 		return -1;
-	hw_checksum = csum_add(hw_checksum, (__force __wsum)(ipv6h->nexthdr << 8));
+	hw_checksum = csum_add(hw_checksum, (__force __wsum)htons(ipv6h->nexthdr));
 
 	csum_pseudo_hdr = csum_partial(&ipv6h->saddr,
 				       sizeof(ipv6h->saddr) + sizeof(ipv6h->daddr), 0);
-- 
1.8.3.1

Re: [PATCH net] net/mlx4_en: Fix endianness bug in IPV6 csum calculation

From: David Miller <davem@davemloft.net>
Date: 2016-05-06 03:27:09

From: Tariq Toukan <redacted>
Date: Wed,  4 May 2016 15:00:33 +0300
From: Daniel Jurgens <redacted>

Use htons instead of unconditionally byte swapping nexthdr.  On a little
endian systems shifting the byte is correct behavior, but it results in
incorrect csums on big endian architectures.

Fixes: f8c6455bb04b ('net/mlx4_en: Extend checksum offloading by CHECKSUM COMPLETE')
Signed-off-by: Daniel Jurgens <redacted>
Reviewed-by: Carol Soto <redacted>
Tested-by: Carol Soto <redacted>
Signed-off-by: Tariq Toukan <redacted>
Applied and queued up for -stable, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help