Re: [PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment()
From: Sergei Shtylyov <hidden>
Date: 2015-09-30 14:42:24
Also in:
lkml
Hello. On 09/30/2015 01:39 AM, Joe Stringer wrote:
quoted hunk ↗ jump to hunk
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 <redacted> --- 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
[...]
quoted hunk ↗ jump to hunk
@@ -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