netdev - Re: [PATCH v2] net: Fix missing meta data in skb with vlan packet

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]

Message-ID: <c105965c-5251-6d07-455a-4ca9ee7adbf2@lab.ntt.co.jp>
Date:   Tue, 16 Apr 2019 09:45:20 +0900
From:   Toshiaki Makita <makita.toshiaki@....ntt.co.jp>
To:     Yuya Kusakabe <yuya.kusakabe@...il.com>
Cc:     davem@...emloft.net, taketarou2@...il.com, netdev@...r.kernel.org,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Jakub Kicinski <jakub.kicinski@...ronome.com>,
        Jesper Dangaard Brouer <hawk@...nel.org>,
        John Fastabend <john.fastabend@...il.com>
Subject: Re: [PATCH v2] net: Fix missing meta data in skb with vlan packet

On 2019/04/15 23:21, Yuya Kusakabe wrote:
> skb_reorder_vlan_header() should move XDP meta data with ethernet header
> if XDP meta data exists.
> 
> Fixes: de8f3a83b0a0 ("bpf: add meta pointer for direct access")
> Signed-off-by: Yuya Kusakabe <yuya.kusakabe@...il.com>
> Signed-off-by: Takeru Hayasaka <taketarou2@...il.com>
> Co-developed-by: Takeru Hayasaka <taketarou2@...il.com>
> ---
...
> @@ -5095,6 +5096,13 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb)
>  		memmove(skb_mac_header(skb) + VLAN_HLEN, skb_mac_header(skb),
>  			mac_len - VLAN_HLEN - ETH_TLEN);
>  	}
> +
> +	meta_len = skb_metadata_len(skb);
> +	if (meta_len) {
> +		meta = skb_metadata_end(skb) - meta_len;
> +		memmove(meta + VLAN_HLEN, meta, meta_len);
> +	};

You still have extra trailing semicolon.

> +
>  	skb->mac_header += VLAN_HLEN;
>  	return skb;
>  }
> 

-- 
Toshiaki Makita