redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ipv6: call consume_skb() in frag/reassembly 

Some kfree_skb() calls should be replaced by consume_skb() to avoid
drop_monitor/dropwatch false positives.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Eric Dumazet 2012-04-24 10:17:59 +00:00 committed by David S. Miller
parent 081579840b
commit 808db80a7e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/ip6_output.c
View File

@ -210,7 +210,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
kfree_skb(skb);
return -ENOBUFS;
}
kfree_skb(skb);
consume_skb(skb);
skb = skb2;
skb_set_owner_w(skb, sk);
}
@ -889,7 +889,7 @@ slow_path:
}
IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_FRAGOKS);
kfree_skb(skb);
consume_skb(skb);
return err;
fail:

2
net/ipv6/reassembly.c
View File

@ -433,7 +433,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
skb_morph(head, fq->q.fragments);
head->next = fq->q.fragments->next;
kfree_skb(fq->q.fragments);
consume_skb(fq->q.fragments);
fq->q.fragments = head;
}