From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from mail-pl0-f45.google.com ([209.85.160.45]:45181 "EHLO
        mail-pl0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751898AbeCCQC0 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sat, 3 Mar 2018 11:02:26 -0500
Received: by mail-pl0-f45.google.com with SMTP id v9-v6so7365245plp.12
        for <netdev@vger.kernel.org>; Sat, 03 Mar 2018 08:02:26 -0800 (PST)
From: Daniel Axtens <dja@axtens.net>
To: Daniel Borkmann <daniel@iogearbox.net>, ast@kernel.org
Cc: netdev@vger.kernel.org,
        Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Subject: Re: [PATCH bpf] bpf: fix bpf_skb_adjust_net/bpf_skb_proto_xlat to deal with gso sctp skbs
In-Reply-To: <20180303020346.9574-1-daniel@iogearbox.net>
References: <20180303020346.9574-1-daniel@iogearbox.net>
Date: Sun, 04 Mar 2018 03:02:20 +1100
Message-ID: <87y3j9cflf.fsf@linkitivity.dja.id.au>
MIME-Version: 1.0
Content-Type: text/plain
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

Hi Daniel,

> From: Daniel Axtens <dja@axtens.net>
>
> SCTP GSO skbs have a gso_size of GSO_BY_FRAGS, so any sort of
> unconditionally mangling of that will result in nonsense value
> and would corrupt the skb later on.
>
> Therefore, i) add two helpers skb_increase_gso_size() and
> skb_decrease_gso_size() that would throw a one time warning and
> bail out for such skbs and ii) refuse and return early with an
> error in those BPF helpers that are affected. We do need to bail
> out as early as possible from there before any changes on the
> skb have been performed.
>
> Fixes: 6578171a7ff0 ("bpf: add bpf_skb_change_proto helper")
> Co-authored-by: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Daniel Axtens <dja@axtens.net>
> Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> Acked-by: Alexei Starovoitov <ast@kernel.org>

I've looked over your changes and they all look good to me.

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

This helper is a fantastic idea and I will send a docs update to
highlight it.

Regards,
Daniel