diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-08-22 19:03:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-23 20:14:36 -0700 |
| commit | 4c3a76abd379d9a4668b2d417baa991de9757dc2 (patch) | |
| tree | 2b0501957c032c6acbf7dcacc23c0702dacaeca8 /net | |
| parent | cca77b7c81876d819a5806f408b3c29b5b61a815 (diff) | |
| download | blackbird-op-linux-4c3a76abd379d9a4668b2d417baa991de9757dc2.tar.gz blackbird-op-linux-4c3a76abd379d9a4668b2d417baa991de9757dc2.zip | |
bridge: netfilter: fix a memory leak
nf_bridge_alloc() always reset the skb->nf_bridge, so we should always
put the old one.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 2c911c0759c2..5ed00bd7009f 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -162,8 +162,8 @@ static inline struct nf_bridge_info *nf_bridge_unshare(struct sk_buff *skb) if (tmp) { memcpy(tmp, nf_bridge, sizeof(struct nf_bridge_info)); atomic_set(&tmp->use, 1); - nf_bridge_put(nf_bridge); } + nf_bridge_put(nf_bridge); nf_bridge = tmp; } return nf_bridge; |
