From patchwork Fri May 14 00:38:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 52530 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 89503B7E39 for ; Fri, 14 May 2010 10:38:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753493Ab0ENAik (ORCPT ); Thu, 13 May 2010 20:38:40 -0400 Received: from [139.142.54.143] ([139.142.54.143]:44732 "EHLO quartz.orcorp.ca" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753025Ab0ENAij (ORCPT ); Thu, 13 May 2010 20:38:39 -0400 Received: from [10.0.0.11] (helo=jggl.edm.orcorp.ca) by quartz.orcorp.ca with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.68) (envelope-from ) id 1OCivC-00058r-Sv; Thu, 13 May 2010 18:38:34 -0600 Received: from jgg by jggl.edm.orcorp.ca with local (Exim 4.69) (envelope-from ) id 1OCivC-0006ql-RB; Thu, 13 May 2010 18:38:34 -0600 Date: Thu, 13 May 2010 18:38:34 -0600 From: Jason Gunthorpe To: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] netfilter: Remove skb_is_nonlinear check from nf_conntrack_sip Message-ID: <20100514003834.GY15969@obsidianresearch.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.11 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org At least the XEN net front driver always produces non linear skbs, so the SIP module does nothing at all when used with that NIC. Copy the hacky technique for accessing SKB data from the ftp conntrack, better than nothing.. Signed-off-by: Jason Gunthorpe --- net/netfilter/nf_conntrack_sip.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 4b57216..37dd7a4 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -30,6 +30,10 @@ MODULE_DESCRIPTION("SIP connection tracking helper"); MODULE_ALIAS("ip_conntrack_sip"); MODULE_ALIAS_NFCT_HELPER("sip"); +/* This is slow, but it's simple. --RR */ +static char *sip_buffer; +static DEFINE_SPINLOCK(nf_sip_lock); + #define MAX_PORTS 8 static unsigned short ports[MAX_PORTS]; static unsigned int ports_c; @@ -1275,17 +1279,14 @@ static int sip_help(struct sk_buff *skb, nf_ct_refresh(ct, skb, sip_timeout * HZ); - if (!skb_is_nonlinear(skb)) - dptr = skb->data + dataoff; - else { - pr_debug("Copy of skbuff not supported yet.\n"); - return NF_ACCEPT; - } - datalen = skb->len - dataoff; if (datalen < strlen("SIP/2.0 200")) return NF_ACCEPT; + spin_lock_bh(&nf_sip_lock); + dptr = skb_header_pointer(skb, dataoff, datalen, sip_buffer); + BUG_ON(dptr == NULL); + if (strnicmp(dptr, "SIP/2.0 ", strlen("SIP/2.0 ")) != 0) ret = process_sip_request(skb, &dptr, &datalen); else @@ -1297,6 +1298,7 @@ static int sip_help(struct sk_buff *skb, ret = NF_DROP; } + spin_unlock_bh(&nf_sip_lock); return ret; } @@ -1329,6 +1331,7 @@ static void nf_conntrack_sip_fini(void) nf_conntrack_helper_unregister(&sip[i][j]); } } + kfree(sip_buffer); } static int __init nf_conntrack_sip_init(void) @@ -1336,6 +1339,10 @@ static int __init nf_conntrack_sip_init(void) int i, j, ret; char *tmpname; + sip_buffer = kmalloc(65536, GFP_KERNEL); + if (!sip_buffer) + return -ENOMEM; + if (ports_c == 0) ports[ports_c++] = SIP_PORT;