From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Daniel Axtens <dja@axtens.net>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH v2 3/4] net: xfrm: use skb_gso_validate_network_len() to check gso sizes
Date: Fri, 2 Mar 2018 18:12:04 -0300 [thread overview]
Message-ID: <20180302211204.GH3887@localhost.localdomain> (raw)
In-Reply-To: <20180301061340.15464-4-dja@axtens.net>
On Thu, Mar 01, 2018 at 05:13:39PM +1100, Daniel Axtens wrote:
> Replace skb_gso_network_seglen() with
> skb_gso_validate_network_len(), as it considers the GSO_BY_FRAGS
> case.
>
> Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> net/ipv4/xfrm4_output.c | 3 ++-
> net/ipv6/xfrm6_output.c | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
> index 94b8702603bc..be980c195fc5 100644
> --- a/net/ipv4/xfrm4_output.c
> +++ b/net/ipv4/xfrm4_output.c
> @@ -30,7 +30,8 @@ static int xfrm4_tunnel_check_size(struct sk_buff *skb)
>
> mtu = dst_mtu(skb_dst(skb));
> if ((!skb_is_gso(skb) && skb->len > mtu) ||
> - (skb_is_gso(skb) && skb_gso_network_seglen(skb) > ip_skb_dst_mtu(skb->sk, skb))) {
> + (skb_is_gso(skb) &&
> + !skb_gso_validate_network_len(skb, ip_skb_dst_mtu(skb->sk, skb)))) {
> skb->protocol = htons(ETH_P_IP);
>
> if (skb->sk)
> diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
> index 8ae87d4ec5ff..5959ce9620eb 100644
> --- a/net/ipv6/xfrm6_output.c
> +++ b/net/ipv6/xfrm6_output.c
> @@ -82,7 +82,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb)
>
> if ((!skb_is_gso(skb) && skb->len > mtu) ||
> (skb_is_gso(skb) &&
> - skb_gso_network_seglen(skb) > ip6_skb_dst_mtu(skb))) {
> + !skb_gso_validate_network_len(skb, ip6_skb_dst_mtu(skb)))) {
> skb->dev = dst->dev;
> skb->protocol = htons(ETH_P_IPV6);
>
> --
> 2.14.1
>
next prev parent reply other threads:[~2018-03-02 21:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 6:13 [PATCH v2 0/4] GSO_BY_FRAGS correctness improvements Daniel Axtens
2018-03-01 6:13 ` [PATCH v2 1/4] net: rename skb_gso_validate_mtu -> skb_gso_validate_network_len Daniel Axtens
2018-03-02 21:11 ` Marcelo Ricardo Leitner
2018-03-01 6:13 ` [PATCH v2 2/4] net: sched: tbf: handle GSO_BY_FRAGS case in enqueue Daniel Axtens
2018-03-02 21:11 ` Marcelo Ricardo Leitner
2018-03-01 6:13 ` [PATCH v2 3/4] net: xfrm: use skb_gso_validate_network_len() to check gso sizes Daniel Axtens
2018-03-02 21:12 ` Marcelo Ricardo Leitner [this message]
2018-03-01 6:13 ` [PATCH v2 4/4] net: make skb_gso_*_seglen functions private Daniel Axtens
2018-03-02 21:13 ` Marcelo Ricardo Leitner
[not found] ` <CAP-MU4PDm-5WaGorMUa4J9GVkmXPJjbyAAaUMvefEsqzFrxQWg@mail.gmail.com>
2018-03-01 20:41 ` [PATCH v2 0/4] GSO_BY_FRAGS correctness improvements Shannon Nelson
2018-03-04 23:11 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302211204.GH3887@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=dja@axtens.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).