lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 212/280] bpf: only test gso type on gso packets
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 4c3024debf62de4c6ac6d3cb4c0063be21d4f652 ]

    BPF can adjust gso only for tcp bytestreams. Fail on other gso types.

    But only on gso packets. It does not touch this field if !gso_size.

    Fixes: b90efd225874 ("bpf: only adjust gso_size on bytestream protocols")
    Signed-off-by: Willem de Bruijn <willemb@google.com>
    Acked-by: Yonghong Song <yhs@fb.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/skbuff.h | 4 ++--
    net/core/filter.c | 8 ++++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
    index 3b0a25bb7c6f..820903ceac4f 100644
    --- a/include/linux/skbuff.h
    +++ b/include/linux/skbuff.h
    @@ -4086,10 +4086,10 @@ static inline bool skb_is_gso_sctp(const struct sk_buff *skb)
    return skb_shinfo(skb)->gso_type & SKB_GSO_SCTP;
    }

    +/* Note: Should be called only if skb_is_gso(skb) is true */
    static inline bool skb_is_gso_tcp(const struct sk_buff *skb)
    {
    - return skb_is_gso(skb) &&
    - skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6);
    + return skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6);
    }

    static inline void skb_gso_reset(struct sk_buff *skb)
    diff --git a/net/core/filter.c b/net/core/filter.c
    index b1369edce113..eb81e9db4093 100644
    --- a/net/core/filter.c
    +++ b/net/core/filter.c
    @@ -2614,7 +2614,7 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb)
    u32 off = skb_mac_header_len(skb);
    int ret;

    - if (!skb_is_gso_tcp(skb))
    + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb))
    return -ENOTSUPP;

    ret = skb_cow(skb, len_diff);
    @@ -2655,7 +2655,7 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)
    u32 off = skb_mac_header_len(skb);
    int ret;

    - if (!skb_is_gso_tcp(skb))
    + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb))
    return -ENOTSUPP;

    ret = skb_unclone(skb, GFP_ATOMIC);
    @@ -2780,7 +2780,7 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 len_diff)
    u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb);
    int ret;

    - if (!skb_is_gso_tcp(skb))
    + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb))
    return -ENOTSUPP;

    ret = skb_cow(skb, len_diff);
    @@ -2809,7 +2809,7 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff)
    u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb);
    int ret;

    - if (!skb_is_gso_tcp(skb))
    + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb))
    return -ENOTSUPP;

    ret = skb_unclone(skb, GFP_ATOMIC);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:39    [W:4.123 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site