Răsfoiți Sursa

netfilter: nf_tables: improve nft payload fast eval

There's an off-by-one issue in nft_payload_fast_eval, skb_tail_pointer
and ptr + priv->len all point to the last valid address plus 1. So if
they are equal, we can still fetch the valid data. It's unnecessary to
fall back to nft_payload_eval.

Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Liping Zhang 9 ani în urmă
părinte
comite
8dc3c2b86b
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      net/netfilter/nf_tables_core.c

+ 1 - 1
net/netfilter/nf_tables_core.c

@@ -98,7 +98,7 @@ static bool nft_payload_fast_eval(const struct nft_expr *expr,
 
 
 	ptr += priv->offset;
 	ptr += priv->offset;
 
 
-	if (unlikely(ptr + priv->len >= skb_tail_pointer(skb)))
+	if (unlikely(ptr + priv->len > skb_tail_pointer(skb)))
 		return false;
 		return false;
 
 
 	*dest = 0;
 	*dest = 0;