forked from Minki/linux
[NET]: skb_find_text ignores to argument
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>
This commit is contained in:
parent
6048126440
commit
f72b948dcb
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user