* [PATCH net 1/1] net/ipv4: ip_vti clear skb cb before tunneling.
@ 2013-06-11 0:45 Saurabh Mohan
2013-06-11 1:28 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: Saurabh Mohan @ 2013-06-11 0:45 UTC (permalink / raw)
To: netdev; +Cc: Saurabh Mohan
From: Saurabh Mohan <saurabh@vyatta.com>
If users apply shaper to vti tunnel then it will cause a kernel crash. The
problem seems to be due to the vti_tunnel_xmit function not clearing
skb->opt field before passing the packet to xfrm tunneling code.
Signed-off-by: Saurabh Mohan <saurabh@vyatta.com>
---
net/ipv4/ip_vti.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 9d2bdb2..c118f6b 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -361,8 +361,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
tunnel->err_count = 0;
}
- IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
- IPSKB_REROUTED);
+ memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
skb_dst_drop(skb);
skb_dst_set(skb, &rt->dst);
nf_reset(skb);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net 1/1] net/ipv4: ip_vti clear skb cb before tunneling.
2013-06-11 0:45 [PATCH net 1/1] net/ipv4: ip_vti clear skb cb before tunneling Saurabh Mohan
@ 2013-06-11 1:28 ` Stephen Hemminger
2013-06-13 9:48 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2013-06-11 1:28 UTC (permalink / raw)
To: Saurabh Mohan; +Cc: netdev, Saurabh Mohan
On Mon, 10 Jun 2013 17:45:10 -0700
Saurabh Mohan <saumoh@gmail.com> wrote:
> From: Saurabh Mohan <saurabh@vyatta.com>
>
> If users apply shaper to vti tunnel then it will cause a kernel crash. The
> problem seems to be due to the vti_tunnel_xmit function not clearing
> skb->opt field before passing the packet to xfrm tunneling code.
>
> Signed-off-by: Saurabh Mohan <saurabh@vyatta.com>
> ---
> net/ipv4/ip_vti.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
> index 9d2bdb2..c118f6b 100644
> --- a/net/ipv4/ip_vti.c
> +++ b/net/ipv4/ip_vti.c
> @@ -361,8 +361,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
> tunnel->err_count = 0;
> }
>
> - IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
> - IPSKB_REROUTED);
> + memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
> skb_dst_drop(skb);
> skb_dst_set(skb, &rt->dst);
> nf_reset(skb);
Thanks, this applies to 3.9 and earlier kernels. When the tunnel code was unified,
this was fixed in ip_tunnel.c
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net 1/1] net/ipv4: ip_vti clear skb cb before tunneling.
2013-06-11 1:28 ` Stephen Hemminger
@ 2013-06-13 9:48 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-06-13 9:48 UTC (permalink / raw)
To: stephen; +Cc: saumoh, netdev, saurabh
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 10 Jun 2013 18:28:22 -0700
> On Mon, 10 Jun 2013 17:45:10 -0700
> Saurabh Mohan <saumoh@gmail.com> wrote:
>
>> From: Saurabh Mohan <saurabh@vyatta.com>
>>
>> If users apply shaper to vti tunnel then it will cause a kernel crash. The
>> problem seems to be due to the vti_tunnel_xmit function not clearing
>> skb->opt field before passing the packet to xfrm tunneling code.
>>
>> Signed-off-by: Saurabh Mohan <saurabh@vyatta.com>
...
> Thanks, this applies to 3.9 and earlier kernels. When the tunnel code was unified,
> this was fixed in ip_tunnel.c
>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-13 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-11 0:45 [PATCH net 1/1] net/ipv4: ip_vti clear skb cb before tunneling Saurabh Mohan
2013-06-11 1:28 ` Stephen Hemminger
2013-06-13 9:48 ` 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).