From: Xin Long <lucien.xin@gmail.com>
To: William Tu <u9012063@gmail.com>
Cc: network dev <netdev@vger.kernel.org>,
David Laight <David.Laight@aculab.com>
Subject: Re: [net-next,v2] ip_gre: check packet length and mtu correctly in erspan tx
Date: Fri, 6 Oct 2017 19:03:14 +0800 [thread overview]
Message-ID: <CADvbK_d7bQNJS_vUk=Q+HrSz8BcJWt=H6xm26ADEZKZGuCy6qw@mail.gmail.com> (raw)
In-Reply-To: <1507230432-56495-1-git-send-email-u9012063@gmail.com>
On Fri, Oct 6, 2017 at 3:07 AM, William Tu <u9012063@gmail.com> wrote:
> Similarly to early patch for erspan_xmit(), the ARPHDR_ETHER device
> is the length of the whole ether packet. So skb->len should subtract
> the dev->hard_header_len.
>
> Fixes: 1a66a836da63 ("gre: add collect_md mode to ERSPAN tunnel")
> Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN")
> Signed-off-by: William Tu <u9012063@gmail.com>
> Cc: Xin Long <lucien.xin@gmail.com>
> Cc: David Laight <David.Laight@aculab.com>
> ---
> v1->v2:
> use addition to avoid overflow
> fix pskb_trim size
> ---
> net/ipv4/ip_gre.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index b279c325c7f6..fb95f68d6e53 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -579,8 +579,8 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,
> if (gre_handle_offloads(skb, false))
> goto err_free_rt;
>
> - if (skb->len > dev->mtu) {
> - pskb_trim(skb, dev->mtu);
> + if (skb->len > dev->mtu + dev->hard_header_len) {
> + pskb_trim(skb, dev->mtu + dev->hard_header_len);
> truncate = true;
> }
>
> @@ -731,8 +731,8 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,
> if (skb_cow_head(skb, dev->needed_headroom))
> goto free_skb;
>
> - if (skb->len - dev->hard_header_len > dev->mtu) {
> - pskb_trim(skb, dev->mtu);
> + if (skb->len > dev->mtu + dev->hard_header_len) {
> + pskb_trim(skb, dev->mtu + dev->hard_header_len);
> truncate = true;
> }
>
> --
> 2.7.4
>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
next prev parent reply other threads:[~2017-10-06 11:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 19:07 [net-next,v2] ip_gre: check packet length and mtu correctly in erspan tx William Tu
2017-10-06 11:03 ` Xin Long [this message]
2017-10-07 22:17 ` 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='CADvbK_d7bQNJS_vUk=Q+HrSz8BcJWt=H6xm26ADEZKZGuCy6qw@mail.gmail.com' \
--to=lucien.xin@gmail.com \
--cc=David.Laight@aculab.com \
--cc=netdev@vger.kernel.org \
--cc=u9012063@gmail.com \
/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).