ip_gre: increase inner ip header ID during segmentation
Subsystems (3)
PATCH 1/1 ip_gre: increase inner ip header ID during segmentation
From: Cong Wang <[email protected]>
According to the previous discussion [1] on netdev list, DaveM insists we should increase the IP header ID for each segmented packets. This patch fixes it.
1. http://marc.info/?t=136384172700001&r=1&w=2
---
net/ipv4/gre.c +6 -0
@@ -125,9 +125,11 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,netdev_features_t enc_features;int ghl =GRE_HEADER_SECTION ;struct gre_base_hdr *greh; +struct iphdr *iph;int mac_len = skb->mac_len;int tnl_hlen;bool csum; +__be16 id; if (unlikely(skb_shinfo(skb)->gso_type & ~(SKB_GSO_TCPV4 |
@@ -170,6 +172,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,skb_set_network_header (skb,skb_inner_network_offset (skb)); skb->mac_len =skb_inner_network_offset (skb); + iph = (struct iphdr *)skb->data; + id = iph->id;/* segment inner packet. */ enc_features = skb->dev->hw_enc_features &netif_skb_features (skb); segs =skb_mac_gso_segment (skb, enc_features);
@@ -179,6 +183,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, skb = segs; tnl_hlen =skb_tnl_header_len (skb); do { + iph = (struct iphdr *)skb->data; + iph->id = id++; __skb_push(skb, ghl); if (csum) { __be32 *pcsum;
net/ipv4/gre.c static struct sk_buff *gre_gso_segment(struct sk_buff *skb, · line 187
Quoted 2 lines · Cong Wang
net/ipv4/gre.c +2
-0+ iph = (struct iphdr *)skb->data; + iph->id = id++;
Oops, seems I missed its endian...
PATCH 1/2 ip_gre: increase inner ip header ID during segmentation
In reply to Cong WangFrom: Cong Wang <[email protected]>
According to the previous discussion [1] on netdev list, DaveM insists we should increase the IP header ID for each segmented packets. This patch fixes it.
1. http://marc.info/?t=136384172700001&r=1&w=2
--- net/ipv4/gre.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
net/ipv4/gre.c +6 -1
@@ -125,8 +125,9 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,netdev_features_t enc_features;int ghl =GRE_HEADER_SECTION ;struct gre_base_hdr *greh; +struct iphdr *iph;int mac_len = skb->mac_len; -int tnl_hlen; +int tnl_hlen, id;bool csum; if (unlikely(skb_shinfo(skb)->gso_type &
@@ -170,6 +171,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,skb_set_network_header (skb,skb_inner_network_offset (skb)); skb->mac_len =skb_inner_network_offset (skb); + iph =ip_hdr (skb); + id =ntohs (iph->id);/* segment inner packet. */ enc_features = skb->dev->hw_enc_features &netif_skb_features (skb); segs =skb_mac_gso_segment (skb, enc_features);
@@ -179,6 +182,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, skb = segs; tnl_hlen =skb_tnl_header_len (skb); do { + iph = (struct iphdr *)skb->data; + iph->id = htons(id++); __skb_push(skb, ghl); if (csum) { __be32 *pcsum;
Signature · 1 line
1.7.7.6
PATCH 2/2 udp: increase inner ip header ID during segmentation
From: Cong Wang <[email protected]>
Similar to GRE tunnel, UDP tunnel should take care of IP header ID too.
--- net/ipv4/udp.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
net/ipv4/udp.c +6 -1
@@ -2304,7 +2304,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,struct sk_buff *segs =ERR_PTR (-EINVAL );int mac_len = skb->mac_len;int tnl_hlen =skb_inner_mac_header (skb) -skb_transport_header (skb); -int outer_hlen; +int outer_hlen, id; +struct iphdr *iph;netdev_features_t enc_features;if (unlikely (!pskb_may_pull (skb, tnl_hlen)))
@@ -2315,6 +2316,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,skb_reset_mac_header (skb);skb_set_network_header (skb,skb_inner_network_offset (skb)); skb->mac_len =skb_inner_network_offset (skb); + iph =ip_hdr (skb); + id =ntohs (iph->id);/* segment inner packet. */ enc_features = skb->dev->hw_enc_features &netif_skb_features (skb);
@@ -2329,6 +2332,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,int udp_offset = outer_hlen - tnl_hlen; skb->mac_len = mac_len; + iph = (struct iphdr *)skb_inner_network_header (skb); + iph->id =htons (id++);skb_push (skb, outer_hlen);skb_reset_mac_header (skb);
Signature · 1 line
1.7.7.6
Re: [PATCH net-next 2/2] udp: increase inner ip header ID during segmentation
From: Cong Wang <[email protected]>
Date: Fri, 22 Mar 2013 18:31:32 +0800
Quoted 9 lines
From: Cong Wang <[email protected]>
Similar to GRE tunnel, UDP tunnel should take care of IP header ID too.
Cc Pravin B Shelar <[email protected]>Cc Eric Dumazet <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied.
From: Cong Wang <[email protected]>
Date: Fri, 22 Mar 2013 18:31:31 +0800
Quoted 10 lines
From: Cong Wang <[email protected]>
According to the previous discussion [1] on netdev list, DaveM insists we should increase the IP header ID for each segmented packets. This patch fixes it.
Cc Pravin B Shelar <[email protected]>Cc Eric Dumazet <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied.
Quoted 6 lines · Cong Wang
From: Cong Wang <[email protected]>
According to the previous discussion [1] on netdev list, DaveM insists we should increase the IP header ID for each segmented packets. This patch fixes it.
Outer IP header ids are incremented in inet_gso_segment for GRE. So it is already done. In any case I don't think we should increment IP-Identification in GRE handler, This is layering violation. This breaks GRE with IPV6 payload.
Quoted 47 lines
Cc Pravin B Shelar <[email protected]>Cc Eric Dumazet <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Cong Wang <[email protected]>1. http://marc.info/?t=136384172700001&r=1&w=2
--- net/ipv4/gre.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)net/ipv4/gre.c +6
-2@@ -125,8 +125,9 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,netdev_features_t enc_features;int ghl =GRE_HEADER_SECTION ;struct gre_base_hdr *greh; +struct iphdr *iph;int mac_len = skb->mac_len; -int tnl_hlen; +int tnl_hlen, id;bool csum; if (unlikely(skb_shinfo(skb)->gso_type &@@ -170,6 +171,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,skb_set_network_header (skb,skb_inner_network_offset (skb)); skb->mac_len =skb_inner_network_offset (skb); + iph =ip_hdr (skb); + id =ntohs (iph->id);/* segment inner packet. */ enc_features = skb->dev->hw_enc_features &netif_skb_features (skb); segs =skb_mac_gso_segment (skb, enc_features);@@ -179,6 +182,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, skb = segs; tnl_hlen =skb_tnl_header_len (skb); do { + iph = (struct iphdr *)skb->data; + iph->id = htons(id++); __skb_push(skb, ghl); if (csum) { __be32 *pcsum; --1.7.7.6
Quoted 8 lines · Pravin Shelar
Quoted 6 lines · Cong Wang
From: Cong Wang <[email protected]>
According to the previous discussion [1] on netdev list, DaveM insists we should increase the IP header ID for each segmented packets. This patch fixes it.
Quoted 4 lines
Outer IP header ids are incremented in
inet_gso_segmentfor GRE. So it is already done. In any case I don't think we should increment IP-Identification in GRE handler, This is layering violation. This breaks GRE with IPV6 payload.
I knew, $subject mentions this increases the *inner* IP header ID, not outer one.
But you are probably right that we should check for IPv4, I will send patch to fix it.
Thanks.
PATCH 1/1 8021q: fix a potential use-after-free
In reply to Cong WangFrom: Cong Wang <[email protected]>
vlan_vid_del() could possibly free ->vlan_info after a RCU grace period, however, we may still refer to the freed memory area by 'grp' pointer. Found by code inspection.
This patch moves vlan_vid_del() as behind as possible.
--- net/8021q/vlan.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
net/8021q/vlan.c +7 -7
@@ -86,13 +86,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) grp = &vlan_info->grp; -/* Take it out of our own structures, but be sure to interlock with -* HW accelerating devices or SW vlan input packet processing if -* VLAN is not 0 (leave it there for 802.1p). -*/ -if (vlan_id) -vlan_vid_del (real_dev, vlan_id); - grp->nr_vlan_devs--;if (vlan->flags &VLAN_FLAG_MVRP )
@@ -114,6 +107,13 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)vlan_gvrp_uninit_applicant (real_dev); } +/* Take it out of our own structures, but be sure to interlock with +* HW accelerating devices or SW vlan input packet processing if +* VLAN is not 0 (leave it there for 802.1p). +*/ +if (vlan_id) +vlan_vid_del (real_dev, vlan_id); +/* Get rid of the vlan's reference to real_dev */ dev_put (real_dev); }
Signature · 1 line
1.7.7.6
PATCH 1/1 802: fix a possible race condition
From: Cong Wang <[email protected]>
garp_pdu_queue() should ways be called with this spin lock. garp_uninit_applicant() only holds rtnl lock which is not enough here.
Found by code inspection.
--- net/802/garp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
net/802/garp.c +4 -0
@@ -609,8 +609,12 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl/* Delete timer and generate a final TRANSMIT_PDU event to flush out * all pending messages before the applicant is gone. */ del_timer_sync (&app->join_timer); + +spin_lock_bh (&app->lock);garp_gid_event (app,GARP_EVENT_TRANSMIT_PDU );garp_pdu_queue (app); +spin_unlock_bh (&app->lock); +garp_queue_xmit (app);dev_mc_del (dev, appl->proto.group_address);
Signature · 1 line
1.7.7.6
David Miller
maintainerRe: [PATCH net-next] 802: fix a possible race condition
From: Cong Wang <[email protected]>
Date: Sat, 23 Mar 2013 13:14:08 +0800
Quoted 6 lines
From: Cong Wang <[email protected]>
garp_pdu_queue()should ways be called with this spin lock.garp_uninit_applicant()only holds rtnl lock which is not enough here.
Quoted 6 lines
Found by code inspection.
Cc "David S. Miller" <[email protected]>Cc David Ward <[email protected]>Cc "Jorge Boncompte [DTI2]" <[email protected]>Signed-off-by Cong Wang <[email protected]>
Under what conditions can entries be removed or added to these RB-trees without the RTNL being held?
If such events cannot happen, then no locking is needed.
Even if your change is correct and necessary, the answer to my needs to be added to your commit message.
Thanks.
Re: [PATCH net-next] 802: fix a possible race condition
Quoted 11 lines · David Miller
From: Cong Wang <[email protected]>
Date: Sat, 23 Mar 2013 13:14:08 +0800Quoted 8 lines
From: Cong Wang <[email protected]>
garp_pdu_queue()should ways be called with this spin lock.garp_uninit_applicant()only holds rtnl lock which is not enough here.Found by code inspection.
Quoted 7 lines
Quoted 4 lines
Cc "David S. Miller" <[email protected]>Cc David Ward <[email protected]>Cc "Jorge Boncompte [DTI2]" <[email protected]>Signed-off-by Cong Wang <[email protected]>Under what conditions can entries be removed or added to these RB-trees without the RTNL being held?
At least garp_join_timer() calls garp_pdu_queue() in a timer:
static void garp_join_timer(unsigned long data)
{
struct garp_applicant *app = (struct garp_applicant *)data;
spin_lock(&app->lock);
garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU);
garp_pdu_queue(app);
spin_unlock(&app->lock);
garp_queue_xmit(app);
garp_join_timer_arm(app);
}which I don't think can hold RTNL lock possibly.
Quoted 5 lines
If such events cannot happen, then no locking is needed.
Even if your change is correct and necessary, the answer to my needs to be added to your commit message.
Ok, I will.
Thanks.
Re: [PATCH net-next] 802: fix a possible race condition
Quoted 15 lines · Cong Wang
At least
garp_join_timer()callsgarp_pdu_queue()in a timer:static void
garp_join_timer(unsigned long data){ struct garp_applicant *app = (struct garp_applicant *)data; spin_lock(&app->lock); garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU); garp_pdu_queue(app); spin_unlock(&app->lock); garp_queue_xmit(app); garp_join_timer_arm(app); }
Quoted 2 lines
which I don't think can hold RTNL lock possibly.
But timer wont possibly run because of the previous :
del_timer_sync(&app->join_timer);
Re: [PATCH net-next] 802: fix a possible race condition
Quoted 17 lines · Eric Dumazet
Quoted 15 lines · Cong Wang
At least
garp_join_timer()callsgarp_pdu_queue()in a timer:static void
garp_join_timer(unsigned long data){ struct garp_applicant *app = (struct garp_applicant *)data; spin_lock(&app->lock); garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU); garp_pdu_queue(app); spin_unlock(&app->lock); garp_queue_xmit(app); garp_join_timer_arm(app); }
Quoted 6 lines
Quoted 2 lines
which I don't think can hold RTNL lock possibly.
But timer wont possibly run because of the previous :
del_timer_sync(&app->join_timer);
Yeah, but in the following callchain:
garp_pdu_rcv() -> garp_pdu_parse_msg() -> garp_pdu_parse_attr() -> garp_gid_event()
the race can happen too as garp_pdu_rcv() is called in BH context.
Re: [PATCH net-next] 8021q: fix a potential use-after-free
In reply to Cong WangQuoted 6 lines · Cong Wang
From: Cong Wang <[email protected]>
vlan_vid_del()could possibly free ->vlan_info after a RCU grace period, however, we may still refer to the freed memory area by 'grp' pointer. Found by code inspection.
Quoted 8 lines
This patch moves
vlan_vid_del()as behind as possible.Cc Patrick McHardy <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Cong Wang <[email protected]>--- net/8021q/vlan.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
Re: [PATCH net-next] 8021q: fix a potential use-after-free
In reply to Cong WangFrom: Cong Wang <[email protected]>
Date: Sat, 23 Mar 2013 13:14:07 +0800
Quoted 11 lines
From: Cong Wang <[email protected]>
vlan_vid_del()could possibly free ->vlan_info after a RCU grace period, however, we may still refer to the freed memory area by 'grp' pointer. Found by code inspection.This patch moves
vlan_vid_del()as behind as possible.Cc Patrick McHardy <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied.