diff options
| author | Harald Welte <laforge@netfilter.org> | 2005-09-16 17:00:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-16 17:00:38 -0700 |
| commit | a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f (patch) | |
| tree | 42039c5eaabcf9501917c2c4ab805183fbea0c8d /net | |
| parent | 136e92bbec0a6d4c2dd1e5b5ac869ab5470547a4 (diff) | |
| download | kernel_samsung_aries-a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f.zip kernel_samsung_aries-a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f.tar.gz kernel_samsung_aries-a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f.tar.bz2 | |
[NETFILTER]: Fix oops in conntrack event cache
ip_ct_refresh_acct() can be called without a valid "skb" pointer.
This used to work, since ct_add_counters() deals with that fact.
However, the recently-added event cache doesn't handle this at all.
This patch is a quick fix that is supposed to be replaced soon by a cleaner
solution during the pending redesign of the event cache.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 19cba16..f8cd8e4 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -1143,7 +1143,10 @@ void ip_ct_refresh_acct(struct ip_conntrack *ct, if (del_timer(&ct->timeout)) { ct->timeout.expires = jiffies + extra_jiffies; add_timer(&ct->timeout); - ip_conntrack_event_cache(IPCT_REFRESH, skb); + /* FIXME: We loose some REFRESH events if this function + * is called without an skb. I'll fix this later -HW */ + if (skb) + ip_conntrack_event_cache(IPCT_REFRESH, skb); } ct_add_counters(ct, ctinfo, skb); write_unlock_bh(&ip_conntrack_lock); |