diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2009-01-05 18:14:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-05 18:14:19 -0800 |
| commit | 6f57321422e0d359e83c978c2b03db77b967b7d5 (patch) | |
| tree | 80d92a8fff5b5ae27ca618f34acf9d696289d6ba /net/sched | |
| parent | f1d3e4dca3f8d4f55656477e83d0afe0ea7cbaed (diff) | |
| download | op-kernel-dev-6f57321422e0d359e83c978c2b03db77b967b7d5.zip op-kernel-dev-6f57321422e0d359e83c978c2b03db77b967b7d5.tar.gz | |
pkt_sched: cls_u32: Fix locking in u32_change()
New nodes are inserted in u32_change() under rtnl_lock() with wmb(),
so without tcf_tree_lock() like in other classifiers (e.g. cls_fw).
This isn't enough without rmb() on the read side, but on the other
hand adding such barriers doesn't give any savings, so the lock is
added instead.
Reported-by: m0sia <m0sia@plotinka.ru>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_u32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 05d1780..07372f6 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -638,8 +638,9 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, break; n->next = *ins; - wmb(); + tcf_tree_lock(tp); *ins = n; + tcf_tree_unlock(tp); *arg = (unsigned long)n; return 0; |
