net: skb_find_text: Ignore patterns extending past 'to'
authorPhil Sutter <phil@nwl.cc>
Tue, 17 Oct 2023 09:39:06 +0000 (11:39 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Oct 2023 10:09:55 +0000 (11:09 +0100)
commitc4eee56e14fe001e1cff54f0b438a5e2d0dd7454
tree65a716224c59aa46608692d49ff871b34bb5edd0
parent37fb1c81d210a5185c1f5399a0801719bba7f7c9
net: skb_find_text: Ignore patterns extending past 'to'

Assume that caller's 'to' offset really represents an upper boundary for
the pattern search, so patterns extending past this offset are to be
rejected.

The old behaviour also was kind of inconsistent when it comes to
fragmentation (or otherwise non-linear skbs): If the pattern started in
between 'to' and 'from' offsets but extended to the next fragment, it
was not found if 'to' offset was still within the current fragment.

Test the new behaviour in a kselftest using iptables' string match.

Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Fixes: f72b948dcbb8 ("[NET]: skb_find_text ignores to argument")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Reviewed-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c
tools/testing/selftests/netfilter/Makefile
tools/testing/selftests/netfilter/xt_string.sh [new file with mode: 0755]