Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758284AbWK2WIv (ORCPT ); Wed, 29 Nov 2006 17:08:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758286AbWK2WDY (ORCPT ); Wed, 29 Nov 2006 17:03:24 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:48340 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1758284AbWK2WDS (ORCPT ); Wed, 29 Nov 2006 17:03:18 -0500 Message-Id: <20061129220445.699466000@sous-sol.org> References: <20061129220111.137430000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Wed, 29 Nov 2006 14:00:22 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org, "David S. Miller" Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Patrick McHardy , Faidon Liambotis Subject: [patch 11/23] NETFILTER: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT Content-Disposition: inline; filename=netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1982 Lines: 53 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Patrick McHardy 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. A similar fix was applied on the SIP connection tracking code some time ago. Signed-off-by: Faidon Liambotis Signed-off-by: Patrick McHardy Signed-off-by: Chris Wright --- commit 76b0c2b63fd5a2da358b36a22b7bf99298dde0b7 tree cd96ddb4c4cd5ffb44ed5a47fa3be41267eea99a parent 1b9bb3c14c60324b54645ffefbe6d270f9fd191c author Faidon Liambotis Fri, 17 Nov 2006 21:01:25 +0100 committer Patrick McHardy Fri, 17 Nov 2006 21:01:25 +0100 net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ linux-2.6.18.4/net/ipv4/netfilter/ip_conntrack_helper_h323.c @@ -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; } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/