]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
bridge: netfilter: fix a memory leak
authorChangli Gao <xiaosuo@gmail.com>
Sun, 22 Aug 2010 19:03:26 +0000 (19:03 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Aug 2010 03:14:36 +0000 (20:14 -0700)
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>
net/bridge/br_netfilter.c

index 2c911c0759c27bb6e4867b3bce9af0af3946d288..5ed00bd7009f55d1bdb5b8697889594442848e3f 100644 (file)
@@ -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;