From 198d5fd02d05deeb8c460b7826058a03d66be10a Mon Sep 17 00:00:00 2001 From: Alaa Hleihel Date: Thu, 14 Feb 2019 13:51:06 +0800 Subject: [PATCH] net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets mainline inclusion from mainline-4.20 commit fe1dc069990c category: bugfix bugzilla: 6077 CVE: NA ------------------------------------------------- CHECKSUM_COMPLETE is not applicable to SCTP protocol. Setting it for SCTP packets leads to CRC32c validation failure. Fixes: bbceefce9adf ("net/mlx5e: Support RX CHECKSUM_COMPLETE") Signed-off-by: Alaa Hleihel Reviewed-by: Or Gerlitz Signed-off-by: Saeed Mahameed Signed-off-by: Keefe LIU Reviewed-by: Wei Yongjun Signed-off-by: Yang Yingliang --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 2a37f5f8a290..f5e4ecb31bc4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -727,6 +727,14 @@ static u32 mlx5e_get_fcs(const struct sk_buff *skb) #define short_frame(size) ((size) <= ETH_ZLEN + ETH_FCS_LEN) +static u8 get_ip_proto(struct sk_buff *skb, __be16 proto) +{ + void *ip_p = skb->data + sizeof(struct ethhdr); + + return (proto == htons(ETH_P_IP)) ? ((struct iphdr *)ip_p)->protocol : + ((struct ipv6hdr *)ip_p)->nexthdr; +} + static inline void mlx5e_handle_csum(struct net_device *netdev, struct mlx5_cqe64 *cqe, struct mlx5e_rq *rq, @@ -758,6 +766,9 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, goto csum_unnecessary; if (likely(is_last_ethertype_ip(skb, &network_depth, &proto))) { + if (unlikely(get_ip_proto(skb, proto) == IPPROTO_SCTP)) + goto csum_unnecessary; + skb->ip_summed = CHECKSUM_COMPLETE; skb->csum = csum_unfold((__force __sum16)cqe->check_sum); if (network_depth > ETH_HLEN) -- GitLab