Commit a8f39143 authored Sep 16, 2005 by Harald Welte Committed by David S. Miller Sep 16, 2005

[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>

parent 136e92bb

net/ipv4/netfilter/ip_conntrack_core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1143,6 +1143,9 @@ void ip_ct_refresh_acct(struct ip_conntrack *ct,
		if (del_timer(&ct->timeout)) {
		ct->timeout.expires = jiffies + extra_jiffies;
		add_timer(&ct->timeout);
		/* 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);