Skip to content

Commit

Permalink
[NET]: skb_find_text ignores to argument
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Phil Oester authored and David S. Miller committed Jun 26, 2006
1 parent 6048126 commit f72b948
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,12 +1739,15 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
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);
}

/**
Expand Down

0 comments on commit f72b948

Please sign in to comment.