Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1235631

Re: [PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment()

Show all headers | View raw

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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment() Joe Stringer <joestringer@nicira.com> - 2015-09-30 00:50 +0200
  Re: [PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment() "Rustad, Mark D" <mark.d.rustad@intel.com> - 2015-09-30 00:50 +0200
    Re: [PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment() Joe Stringer <joestringer@nicira.com> - 2015-09-30 01:20 +0200
  Re: [PATCH net 3/7] openvswitch: Fix skb leak in ovs_fragment() Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-09-30 16:50 +0200

csiph-web