summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-12-31 12:48:55 -0800
committerDavid S. Miller <davem@davemloft.net>2010-12-31 12:48:55 -0800
commit18c8d82ae5b802c5d82e0dfbcc08b1b568955f46 (patch)
tree6a9ff2bc889e63494b5636e9dbe8b8c9a5e296af /net/sched
parenteeaeb068f1393b4db4861481bf594bcd1c3eda7a (diff)
downloadblackbird-op-linux-18c8d82ae5b802c5d82e0dfbcc08b1b568955f46.tar.gz
blackbird-op-linux-18c8d82ae5b802c5d82e0dfbcc08b1b568955f46.zip
sfq: fix slot_dequeue_head()
slot_dequeue_head() should make sure slot skb chain is correct in both ways, or we can crash if all possible flows are in use. Jarek pointed out slot_queue_init() can now be done in sfq_init() once, instead each time a flow is setup. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_sfq.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index b76d46b71466..d54ac94066c2 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -297,6 +297,7 @@ static inline struct sk_buff *slot_dequeue_head(struct sfq_slot *slot)
struct sk_buff *skb = slot->skblist_next;
slot->skblist_next = skb->next;
+ skb->next->prev = (struct sk_buff *)slot;
skb->next = skb->prev = NULL;
return skb;
}
@@ -380,7 +381,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
q->ht[hash] = x;
slot = &q->slots[x];
slot->hash = hash;
- slot_queue_init(slot);
}
/* If selected queue has length q->limit, do simple tail drop,
@@ -545,8 +545,10 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt)
return err;
}
- for (i = 0; i < SFQ_SLOTS; i++)
+ for (i = 0; i < SFQ_SLOTS; i++) {
+ slot_queue_init(&q->slots[i]);
sfq_link(q, i);
+ }
return 0;
}
OpenPOWER on IntegriCloud