projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cca77b7
)
bridge: netfilter: fix a memory leak
author
Changli Gao
<xiaosuo@gmail.com>
Sun, 22 Aug 2010 19:03:26 +0000
(19:03 +0000)
committer
David 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
patch
|
blob
|
history
diff --git
a/net/bridge/br_netfilter.c
b/net/bridge/br_netfilter.c
index
2c911c0
..
5ed00bd
100644
(file)
--- 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;