diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-14 21:18:17 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-14 21:18:17 +0200 |
| commit | a1d7c1b4b8dfbc5ecadcff9284d64bb6ad4c0196 (patch) | |
| tree | ef5564d5f91d99f8af1bfa16118191b7020c8c84 /net | |
| parent | 736d58e3a2245ac2779fe0f278f8735bcf33ca8d (diff) | |
| download | linux-a1d7c1b4b8dfbc5ecadcff9284d64bb6ad4c0196.tar.gz linux-a1d7c1b4b8dfbc5ecadcff9284d64bb6ad4c0196.tar.bz2 linux-a1d7c1b4b8dfbc5ecadcff9284d64bb6ad4c0196.zip | |
netfilter: nf_ct_sip: handle non-linear skbs
Handle non-linear skbs by linearizing them instead of silently failing.
Long term the helper should be fixed to either work with non-linear skbs
directly by using the string search API or work on a copy of the data.
Based on patch by Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index b20f4275893c..53d892210a04 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -1393,10 +1393,8 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff, nf_ct_refresh(ct, skb, sip_timeout * HZ); - if (skb_is_nonlinear(skb)) { - pr_debug("Copy of skbuff not supported yet.\n"); - return NF_ACCEPT; - } + if (unlikely(skb_linearize(skb))) + return NF_DROP; dptr = skb->data + dataoff; datalen = skb->len - dataoff; @@ -1455,10 +1453,8 @@ static int sip_help_udp(struct sk_buff *skb, unsigned int protoff, nf_ct_refresh(ct, skb, sip_timeout * HZ); - if (skb_is_nonlinear(skb)) { - pr_debug("Copy of skbuff not supported yet.\n"); - return NF_ACCEPT; - } + if (unlikely(skb_linearize(skb))) + return NF_DROP; dptr = skb->data + dataoff; datalen = skb->len - dataoff; |