lkml.org 
[lkml]   [2012]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 12/54] netem: fix possible skb leak
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 116a0fc31c6c9b8fc821be5a96e5bf0b43260131 ]

    skb_checksum_help(skb) can return an error, we must free skb in this
    case. qdisc_drop(skb, sch) can also be feeded with a NULL skb (if
    skb_unshare() failed), so lets use this generic helper.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sched/sch_netem.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/net/sched/sch_netem.c
    +++ b/net/sched/sch_netem.c
    @@ -350,10 +350,8 @@ static int netem_enqueue(struct sk_buff
    if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {
    if (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||
    (skb->ip_summed == CHECKSUM_PARTIAL &&
    - skb_checksum_help(skb))) {
    - sch->qstats.drops++;
    - return NET_XMIT_DROP;
    - }
    + skb_checksum_help(skb)))
    + return qdisc_drop(skb, sch);

    skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);
    }



    \
     
     \ /
      Last update: 2012-05-19 02:21    [W:4.413 / U:0.004 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site