netdev - Re: [Patch net] mlx5: fix get_ip

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 29 Nov 2018 13:13:05 +0000
From:   Tariq Toukan <tariqt@...lanox.com>
To:     Cong Wang <xiyou.wangcong@...il.com>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC:     Alaa Hleihel <alaa@...lanox.com>,
        Or Gerlitz <ogerlitz@...lanox.com>,
        Saeed Mahameed <saeedm@...lanox.com>
Subject: Re: [Patch net] mlx5: fix get_ip_proto()



On 29/11/2018 1:04 AM, Cong Wang wrote:
> 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>
> ---
>   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 9b6bd2b51556..f7c5dbb0ffcd 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> @@ -724,9 +724,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;
> @@ -786,7 +786,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;
> 

LGTM. Thanks for you patch, Cong.

Reviewed-by: Tariq Toukan <tariqt@...lanox.com>