netdev - Re: [PATCH net] bpf: fix csum setting for bpf_set_tunnel

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: <56CEDB5B.7060805@iogearbox.net>
Date:	Thu, 25 Feb 2016 11:45:47 +0100
From:	Daniel Borkmann <daniel@...earbox.net>
To:	David Miller <davem@...emloft.net>
CC:	alexei.starovoitov@...il.com, tgraf@...g.ch, jesse@...nel.org,
	netdev@...r.kernel.org
Subject: Re: [PATCH net] bpf: fix csum setting for bpf_set_tunnel_key

On 02/24/2016 10:24 PM, David Miller wrote:
[...]
> Applied to 'net', thanks Daniel.

Thanks!

Btw, in case net gets merged into net-next, there will be a minor
merge conflict due to stackid flags present in net-next. This can
be easily resolved by keeping both chunks.

For example, result after merge in include/uapi/linux/bpf.h then
looks like:

/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
#define BPF_F_TUNINFO_IPV6              (1ULL << 0)

/* BPF_FUNC_skb_set_tunnel_key flags. */
#define BPF_F_ZERO_CSUM_TX              (1ULL << 1)

/* BPF_FUNC_get_stackid flags. */
#define BPF_F_SKIP_FIELD_MASK           0xffULL
#define BPF_F_USER_STACK                (1ULL << 8)
#define BPF_F_FAST_STACK_CMP            (1ULL << 9)
#define BPF_F_REUSE_STACKID             (1ULL << 10)

Thanks,
Daniel