From mboxrd@z Thu Jan 1 00:00:00 1970 From: Faidon Liambotis Subject: [PATCH 2.6.19-rc6] netfilter: fix panic on ip_conntrack_h323 with CONFIG_IP_NF_CT_ACCT Date: Mon, 20 Nov 2006 21:39:31 +0200 Message-ID: <20061120193931.GA9913@void.cube.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Return-path: To: coreteam@netfilter.org Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org H.323 connection tracking code calls ip_ct_refresh_acct() when processing RCFs and URQs but passes NULL as the skb. When CONFIG_IP_NF_CT_ACCT is enabled, the connection tracking core tries to derefence the skb, which results in an obvious panic. ago. The patch uses ip_ct_refresh() instead of ip_ct_refresh_acct() to avoid double accounting (suggested by Patrick McHardy). Signed-off-by: Faidon Liambotis --- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c 2006-11-15 19:07:50.000000000 +0200 +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c 2006-11-16 11:09:46.000000000 +0200 @@ -1417,7 +1417,7 @@ static int process_rcf(struct sk_buff ** DEBUGP ("ip_ct_ras: set RAS connection timeout to %u seconds\n", info->timeout); - ip_ct_refresh_acct(ct, ctinfo, NULL, info->timeout * HZ); + ip_ct_refresh(ct, *pskb, info->timeout * HZ); /* Set expect timeout */ read_lock_bh(&ip_conntrack_lock); @@ -1465,7 +1465,7 @@ static int process_urq(struct sk_buff ** info->sig_port[!dir] = 0; /* Give it 30 seconds for UCF or URJ */ - ip_ct_refresh_acct(ct, ctinfo, NULL, 30 * HZ); + ip_ct_refresh(ct, *pskb, 30 * HZ); return 0; }