summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2008-01-09 08:41:28 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-09 08:41:28 +0100
commit9d3e44425e3498eb33f25d94392b4fd0d56a5176 (patch)
tree453e71e0dfae127df026c64e2b1a24aa4f629b3d
parent[XFRM]: xfrm_algo_clone() allocates too much memory (diff)
downloadlinux-9d3e44425e3498eb33f25d94392b4fd0d56a5176.tar.xz
linux-9d3e44425e3498eb33f25d94392b4fd0d56a5176.zip
[SOCK]: Adds a rcu_dereference() in sk_filter
It seems commit fda9ef5d679b07c9d9097aaf6ef7f069d794a8f9 introduced a RCU protection for sk_filter(), without a rcu_dereference() Either we need a rcu_dereference(), either a comment should explain why we dont need it. I vote for the former. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 67e35c7e230c..6e1542da33a1 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -944,7 +944,7 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
return err;
rcu_read_lock_bh();
- filter = sk->sk_filter;
+ filter = rcu_dereference(sk->sk_filter);
if (filter) {
unsigned int pkt_len = sk_run_filter(skb, filter->insns,
filter->len);