summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-08-24 19:35:38 +0200
committerPatrick McHardy <kaber@trash.net>2009-08-24 19:35:38 +0200
commitf3abc9b963e004b8c96cd7fbee6fd905f2bfd620 (patch)
tree9924da76d5d1258824a05dd97264fb8446dd2058
parentnetfilter: nf_nat: fix inverted logic for persistent NAT mappings (diff)
downloadlinux-f3abc9b963e004b8c96cd7fbee6fd905f2bfd620.tar.xz
linux-f3abc9b963e004b8c96cd7fbee6fd905f2bfd620.zip
netfilter: bridge: refcount fix
commit f216f082b2b37c4943f1e7c393e2786648d48f6f ([NETFILTER]: bridge netfilter: deal with martians correctly) added a refcount leak on in_dev. Instead of using in_dev_get(), we can use __in_dev_get_rcu(), as netfilter hooks are running under rcu_read_lock(), as pointed by Patrick. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--net/bridge/br_netfilter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 4fde7425077d..907a82e9023d 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -359,7 +359,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
},
.proto = 0,
};
- struct in_device *in_dev = in_dev_get(dev);
+ struct in_device *in_dev = __in_dev_get_rcu(dev);
/* If err equals -EHOSTUNREACH the error is due to a
* martian destination or due to the fact that