Skip to content

Commit 35d889d

Browse files
akodanevdavem330
authored andcommitted
sch_netem: fix skb leak in netem_enqueue()
When we exceed current packets limit and we have more than one segment in the list returned by skb_gso_segment(), netem drops only the first one, skipping the rest, hence kmemleak reports: unreferenced object 0xffff880b5d23b600 (size 1024): comm "softirq", pid 0, jiffies 4384527763 (age 2770.629s) hex dump (first 32 bytes): 00 80 23 5d 0b 88 ff ff 00 00 00 00 00 00 00 00 ..#]............ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000d8a19b9d>] __alloc_skb+0xc9/0x520 [<000000001709b32f>] skb_segment+0x8c8/0x3710 [<00000000c7b9bb88>] tcp_gso_segment+0x331/0x1830 [<00000000c921cba1>] inet_gso_segment+0x476/0x1370 [<000000008b762dd4>] skb_mac_gso_segment+0x1f9/0x510 [<000000002182660a>] __skb_gso_segment+0x1dd/0x620 [<00000000412651b9>] netem_enqueue+0x1536/0x2590 [sch_netem] [<0000000005d3b2a9>] __dev_queue_xmit+0x1167/0x2120 [<00000000fc5f7327>] ip_finish_output2+0x998/0xf00 [<00000000d309e9d3>] ip_output+0x1aa/0x2c0 [<000000007ecbd3a4>] tcp_transmit_skb+0x18db/0x3670 [<0000000042d2a45f>] tcp_write_xmit+0x4d4/0x58c0 [<0000000056a44199>] tcp_tasklet_func+0x3d9/0x540 [<0000000013d06d02>] tasklet_action+0x1ca/0x250 [<00000000fcde0b8b>] __do_softirq+0x1b4/0x5a3 [<00000000e7ed027c>] irq_exit+0x1e2/0x210 Fix it by adding the rest of the segments, if any, to skb 'to_free' list. Add new __qdisc_drop_all() and qdisc_drop_all() functions because they can be useful in the future if we need to drop segmented GSO packets in other places. Fixes: 6071bd1 ("netem: Segment GSO packets on enqueue") Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 89036a2 commit 35d889d

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

include/net/sch_generic.h

+19
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,16 @@ static inline void __qdisc_drop(struct sk_buff *skb, struct sk_buff **to_free)
824824
*to_free = skb;
825825
}
826826

827+
static inline void __qdisc_drop_all(struct sk_buff *skb,
828+
struct sk_buff **to_free)
829+
{
830+
if (skb->prev)
831+
skb->prev->next = *to_free;
832+
else
833+
skb->next = *to_free;
834+
*to_free = skb;
835+
}
836+
827837
static inline unsigned int __qdisc_queue_drop_head(struct Qdisc *sch,
828838
struct qdisc_skb_head *qh,
829839
struct sk_buff **to_free)
@@ -956,6 +966,15 @@ static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch,
956966
return NET_XMIT_DROP;
957967
}
958968

969+
static inline int qdisc_drop_all(struct sk_buff *skb, struct Qdisc *sch,
970+
struct sk_buff **to_free)
971+
{
972+
__qdisc_drop_all(skb, to_free);
973+
qdisc_qstats_drop(sch);
974+
975+
return NET_XMIT_DROP;
976+
}
977+
959978
/* Length to Time (L2T) lookup in a qdisc_rate_table, to determine how
960979
long it will take to send a packet given its size.
961980
*/

net/sched/sch_netem.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
509509
}
510510

511511
if (unlikely(sch->q.qlen >= sch->limit))
512-
return qdisc_drop(skb, sch, to_free);
512+
return qdisc_drop_all(skb, sch, to_free);
513513

514514
qdisc_qstats_backlog_inc(sch, skb);
515515

0 commit comments

Comments
 (0)