* [net-next,v2] ip_gre: check packet length and mtu correctly in erspan tx
@ 2017-10-05 19:07 William Tu
2017-10-06 11:03 ` Xin Long
2017-10-07 22:17 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: William Tu @ 2017-10-05 19:07 UTC (permalink / raw)
To: netdev; +Cc: Xin Long, David Laight
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [net-next,v2] ip_gre: check packet length and mtu correctly in erspan tx
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
2017-10-07 22:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Xin Long @ 2017-10-06 11:03 UTC (permalink / raw)
To: William Tu; +Cc: network dev, David Laight
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [net-next,v2] ip_gre: check packet length and mtu correctly in erspan tx
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
@ 2017-10-07 22:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-10-07 22:17 UTC (permalink / raw)
To: u9012063; +Cc: netdev, lucien.xin, David.Laight
From: William Tu <u9012063@gmail.com>
Date: Thu, 5 Oct 2017 12:07:12 -0700
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-07 22:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2017-10-07 22:17 ` David Miller
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).