mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
net: sched: fix 32-bit backlog wrap in gred, bfifo and plug enqueue
gred_enqueue(), bfifo_enqueue() and plug_enqueue() admit a packet when the
current backlog plus the packet length fits within the queue limit:
sch->qstats.backlog + qdisc_pkt_len(skb) <= sch->limit (gred default VQ)
gred_backlog+qdisc_pkt_len(skb) <= q->limit (gred configured VQ)
sch->qstats.backlog + qdisc_pkt_len(skb) <= sch->limit (bfifo)
sch->qstats.backlog + skb->len <= q->limit (plug)
sch->qstats.backlog and q->backlog are u32, and qdisc_pkt_len()/skb->len
are unsigned int, so all sums are computed in 32 bits and wrap at 2^32.
Once the true backlog exceeds 4 GiB the wrapped sum becomes small and
admission keeps succeeding, so the queue grows without bound and the kernel
can be driven to OOM.
Promote the sums to u64 so admission stops once the true backlog exceeds
the limit. The limit is u32, so the bounded queue stays below 2^32 and
the stored u32 backlog never wraps.
The bug can only be reproduced as root (albeit with ridiculous setup):
attach a gred (or bfifo/plug) qdisc with a limit near 4 GiB,
leaving the default VQ unconfigured (for gred), and drive >4 GiB of
queued traffic (e.g. via a size table / stab to inflate qdisc_pkt_len,
or sustained high-rate traffic). The u32 backlog+len sum wraps at 2^32,
admission keeps succeeding, and the queue grows unboundedly to OOM.
Fixes: a3eb95f891 ("net_sched: gred: add TCA_GRED_LIMIT attribute")
Reported-by: vega@nebusec.ai
Tested-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260818095927.15901-1-jhs@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
d9c56501c7
commit
4c660ee8c8
|
|
@ -19,7 +19,7 @@
|
|||
static int bfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
||||
struct sk_buff **to_free)
|
||||
{
|
||||
if (likely(sch->qstats.backlog + qdisc_pkt_len(skb) <=
|
||||
if (likely((u64)sch->qstats.backlog + qdisc_pkt_len(skb) <=
|
||||
READ_ONCE(sch->limit)))
|
||||
return qdisc_enqueue_tail(skb, sch);
|
||||
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ static int gred_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|||
* if no default DP has been configured. This
|
||||
* allows for DP flows to be left untouched.
|
||||
*/
|
||||
if (likely(sch->qstats.backlog + qdisc_pkt_len(skb) <=
|
||||
if (likely((u64)sch->qstats.backlog + qdisc_pkt_len(skb) <=
|
||||
sch->limit))
|
||||
return qdisc_enqueue_tail(skb, sch);
|
||||
else
|
||||
|
|
@ -244,7 +244,7 @@ static int gred_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|||
break;
|
||||
}
|
||||
|
||||
if (gred_backlog(t, q, sch) + qdisc_pkt_len(skb) <= q->limit) {
|
||||
if ((u64)gred_backlog(t, q, sch) + qdisc_pkt_len(skb) <= q->limit) {
|
||||
q->backlog += qdisc_pkt_len(skb);
|
||||
return qdisc_enqueue_tail(skb, sch);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ static int plug_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|||
{
|
||||
struct plug_sched_data *q = qdisc_priv(sch);
|
||||
|
||||
if (likely(sch->qstats.backlog + skb->len <= q->limit)) {
|
||||
if (likely((u64)sch->qstats.backlog + skb->len <= q->limit)) {
|
||||
if (!q->unplug_indefinite)
|
||||
q->pkts_current_epoch++;
|
||||
return qdisc_enqueue_tail(skb, sch);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user