| Message ID | 1443566380-22640-4-git-send-email-joestringer@nicira.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
> On Sep 29, 2015, at 3:39 PM, Joe Stringer <joestringer@nicira.com> wrote: > > @@ -728,8 +727,14 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, > WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", > ovs_vport_name(vport), ntohs(ethertype), mru, > vport->dev->mtu); > - kfree_skb(skb); > + goto out; > } > + > + skb = NULL; > + > +out: > + if (skb) > + kfree_skb(skb); > } > > static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, Wouldn't that hunk be better as: @@ -728,8 +727,13 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", ovs_vport_name(vport), ntohs(ethertype), mru, vport->dev->mtu); - kfree_skb(skb); + goto out; } + + return; + +out: + kfree_skb(skb); } static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, -- Mark Rustad, Networking Division, Intel Corporation
On 29 September 2015 at 15:48, Rustad, Mark D <mark.d.rustad@intel.com> wrote: >> On Sep 29, 2015, at 3:39 PM, Joe Stringer <joestringer@nicira.com> wrote: >> >> @@ -728,8 +727,14 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, >> WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", >> ovs_vport_name(vport), ntohs(ethertype), mru, >> vport->dev->mtu); >> - kfree_skb(skb); >> + goto out; >> } >> + >> + skb = NULL; >> + >> +out: >> + if (skb) >> + kfree_skb(skb); >> } >> >> static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, > > Wouldn't that hunk be better as: > > @@ -728,8 +727,13 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, > WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", > ovs_vport_name(vport), ntohs(ethertype), mru, > vport->dev->mtu); > - kfree_skb(skb); > + goto out; > } > + > + return; > + > +out: > + kfree_skb(skb); > } > > static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, > > -- > Mark Rustad, Networking Division, Intel Corporation Sure thing, I'll roll this change in to a v2 when the rest of the series is reviewed. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 09/30/2015 01:39 AM, Joe Stringer wrote: > If ovs_fragment() was unable to fragment the skb due to an L2 header > that exceeds the supported length, skbs would be leaked. Fix the bug. > > Fixes: 7f8a436 "openvswitch: Add conntrack action" > Signed-off-by: Joe Stringer <joestringer@nicira.com> > --- > net/openvswitch/actions.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c > index e23a61c..e1afbd1 100644 > --- a/net/openvswitch/actions.c > +++ b/net/openvswitch/actions.c [...] > @@ -728,8 +727,14 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, > WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", > ovs_vport_name(vport), ntohs(ethertype), mru, > vport->dev->mtu); > - kfree_skb(skb); > + goto out; > } > + > + skb = NULL; I'd just return here. > + > +out: > + if (skb) > + kfree_skb(skb); kfree_skb() checks for NULL. [...] MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index e23a61c..e1afbd1 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -684,7 +684,7 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, { if (skb_network_offset(skb) > MAX_L2_LEN) { OVS_NLERR(1, "L2 header too long to fragment"); - return; + goto out; } if (ethertype == htons(ETH_P_IP)) { @@ -708,8 +708,7 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, struct rt6_info ovs_rt; if (!v6ops) { - kfree_skb(skb); - return; + goto out; } prepare_frag(vport, skb); @@ -728,8 +727,14 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.", ovs_vport_name(vport), ntohs(ethertype), mru, vport->dev->mtu); - kfree_skb(skb); + goto out; } + + skb = NULL; + +out: + if (skb) + kfree_skb(skb); } static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port,
If ovs_fragment() was unable to fragment the skb due to an L2 header that exceeds the supported length, skbs would be leaked. Fix the bug. Fixes: 7f8a436 "openvswitch: Add conntrack action" Signed-off-by: Joe Stringer <joestringer@nicira.com> --- net/openvswitch/actions.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)