lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 23 Sep 2019 12:40:12 +0000 From: Saeed Mahameed <saeedm@...lanox.com> To: Greg Kroah-Hartman <gregkh@...uxfoundation.org> CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "stable@...r.kernel.org" <stable@...r.kernel.org>, "David S. Miller" <davem@...emloft.net>, Cong Wang <xiyou.wangcong@...il.com>, Alaa Hleihel <alaa@...lanox.com>, Or Gerlitz <ogerlitz@...lanox.com>, Saeed Mahameed <saeedm@...lanox.com>, Tariq Toukan <tariqt@...lanox.com> Subject: [PATCH 4.19-stable 3/7] mlx5: fix get_ip_proto() From: Cong Wang <xiyou.wangcong@...il.com> [ Upstream commit ef6fcd455278c2be3032a346cc66d9dd9866b787 ] IP header is not necessarily located right after struct ethhdr, there could be multiple 802.1Q headers in between, this is why we call __vlan_get_protocol(). Fixes: fe1dc069990c ("net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets") Cc: Alaa Hleihel <alaa@...lanox.com> Cc: Or Gerlitz <ogerlitz@...lanox.com> Cc: Saeed Mahameed <saeedm@...lanox.com> Signed-off-by: Cong Wang <xiyou.wangcong@...il.com> Reviewed-by: Tariq Toukan <tariqt@...lanox.com> Acked-by: Saeed Mahameed <saeedm@...lanox.com> Signed-off-by: David S. Miller <davem@...emloft.net> Signed-off-by: Saeed Mahameed <saeedm@...lanox.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 61eab0c55fca..8323534f075a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -725,9 +725,9 @@ static u32 mlx5e_get_fcs(const struct sk_buff *skb) return __get_unaligned_cpu32(fcs_bytes); } -static u8 get_ip_proto(struct sk_buff *skb, __be16 proto) +static u8 get_ip_proto(struct sk_buff *skb, int network_depth, __be16 proto) { - void *ip_p = skb->data + sizeof(struct ethhdr); + void *ip_p = skb->data + network_depth; return (proto == htons(ETH_P_IP)) ? ((struct iphdr *)ip_p)->protocol : ((struct ipv6hdr *)ip_p)->nexthdr; @@ -766,7 +766,7 @@ 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)) + if (unlikely(get_ip_proto(skb, network_depth, proto) == IPPROTO_SCTP)) goto csum_unnecessary; skb->ip_summed = CHECKSUM_COMPLETE; -- 2.21.0
Powered by blists - more mailing lists