netdev - Re: [PATCH bpf-next] selftests/bpf: reserve flags in bpf_skb_net

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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 16 Apr 2019 10:28:36 +0200
From:   Daniel Borkmann <daniel@...earbox.net>
To:     Willem de Bruijn <willemdebruijn.kernel@...il.com>,
        netdev@...r.kernel.org
Cc:     ast@...nel.org, alan.maguire@...cle.com,
        Willem de Bruijn <willemb@...gle.com>
Subject: Re: [PATCH bpf-next] selftests/bpf: reserve flags in
 bpf_skb_net_shrink

On 04/12/2019 03:30 PM, Willem de Bruijn wrote:
> From: Willem de Bruijn <willemb@...gle.com>
> 
> The ENCAP flags in bpf_skb_adjust_room are ignored on decap with
> bpf_skb_net_shrink. Reserve these bits for future use.
> 
> Fixes: 868d523535c2d ("bpf: add bpf_skb_adjust_room encap flags")
> Signed-off-by: Willem de Bruijn <willemb@...gle.com>

Applied, thanks! I fixed up $SUBJECT since it's not selftests. ;-)

> ---
>  net/core/filter.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 95a27fdf9a405..bd1f51907b83b 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -3069,6 +3069,9 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff,
>  {
>  	int ret;
>  
> +	if (flags & ~BPF_F_ADJ_ROOM_FIXED_GSO)
> +		return -EINVAL;
> +
>  	if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) {
>  		/* udp gso_size delineates datagrams, only allow if fixed */
>  		if (!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) ||
>