[PATCH] skb_find_text ignores to argument

[PATCH] skb_find_text ignores to argument

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

skb_find_text takes a "to" argument which is supposed to limit how
far into the skb it will search for the given text.  At present,
it seems to ignore that argument on the first skb, and instead
return a match even if the text occurs beyond the limit.

Patch below fixes this, after adjusting for the "from" starting
point.  This consequently fixes the netfilter string match's "--to"
handling, which currently is broken.

Phil

Signed-off-by: Phil Oester <kernel@linuxace.com>



[-- Attachment #2: patch-skbfindtext --]
[-- Type: text/plain, Size: 616 bytes --]

diff -ruN linux-orig/net/core/skbuff.c linux-new/net/core/skbuff.c
--- linux-orig/net/core/skbuff.c	2006-06-25 01:26:02.000000000 -0400
+++ linux-new/net/core/skbuff.c	2006-06-25 01:29:40.000000000 -0400
@@ -1739,12 +1739,15 @@
 			   unsigned int to, struct ts_config *config,
 			   struct ts_state *state)
 {
+	unsigned int ret;
+
 	config->get_next_block = skb_ts_get_next_block;
 	config->finish = skb_ts_finish;
 
 	skb_prepare_seq_read(skb, from, to, TS_SKB_CB(state));
 
-	return textsearch_find(config, state);
+	ret = textsearch_find(config, state);
+	return (ret <= to - from ? ret : UINT_MAX);
 }
 
 /**

Re: [PATCH] skb_find_text ignores to argument

[David Miller]

From: Phil Oester <kernel@linuxace.com>
Date: Sun, 25 Jun 2006 07:52:00 -0700

> skb_find_text takes a "to" argument which is supposed to limit how
> far into the skb it will search for the given text.  At present,
> it seems to ignore that argument on the first skb, and instead
> return a match even if the text occurs beyond the limit.
> 
> Patch below fixes this, after adjusting for the "from" starting
> point.  This consequently fixes the netfilter string match's "--to"
> handling, which currently is broken.
> 
> Signed-off-by: Phil Oester <kernel@linuxace.com>

Looks good, applied.

Thanks Phil.