diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-12-05 13:38:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-12-05 13:38:16 -0800 |
| commit | 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 (patch) | |
| tree | 72c789e69e84e4b66d4f5a4162d92233cb0b8b91 /net | |
| parent | 266c8543480e2202ab63d1d604a5ca049f350cd8 (diff) | |
| download | kernel_samsung_crespo-2fdf1faa8e33082d691bcba18814276f2bd5a6f0.zip kernel_samsung_crespo-2fdf1faa8e33082d691bcba18814276f2bd5a6f0.tar.gz kernel_samsung_crespo-2fdf1faa8e33082d691bcba18814276f2bd5a6f0.tar.bz2 | |
[NETFILTER]: Don't use conntrack entry after dropping the reference
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index d058ac4..91fe8f2 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb, return -ENOENT; } } - if (del_timer(&ct->timeout)) { - ip_conntrack_put(ct); + if (del_timer(&ct->timeout)) ct->timeout.function((unsigned long)ct); - return 0; - } + ip_conntrack_put(ct); DEBUGP("leaving\n"); |