Commit 8dc3c2b8 authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso

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: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2462f3f4
...@@ -98,7 +98,7 @@ static bool nft_payload_fast_eval(const struct nft_expr *expr, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment