Commit 962e5a40 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nft_exthdr: break evaluation if setting TCP option fails

Break rule evaluation on malformed TCP options.

Fixes: 99d1712b ("netfilter: exthdr: tcp option set support")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0de53b0f
...@@ -236,7 +236,7 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr, ...@@ -236,7 +236,7 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff, &tcphdr_len); tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff, &tcphdr_len);
if (!tcph) if (!tcph)
return; goto err;
opt = (u8 *)tcph; opt = (u8 *)tcph;
for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) { for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) {
...@@ -251,16 +251,16 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr, ...@@ -251,16 +251,16 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
continue; continue;
if (i + optl > tcphdr_len || priv->len + priv->offset > optl) if (i + optl > tcphdr_len || priv->len + priv->offset > optl)
return; goto err;
if (skb_ensure_writable(pkt->skb, if (skb_ensure_writable(pkt->skb,
nft_thoff(pkt) + i + priv->len)) nft_thoff(pkt) + i + priv->len))
return; goto err;
tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff, tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff,
&tcphdr_len); &tcphdr_len);
if (!tcph) if (!tcph)
return; goto err;
offset = i + priv->offset; offset = i + priv->offset;
...@@ -303,6 +303,9 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr, ...@@ -303,6 +303,9 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
return; return;
} }
return;
err:
regs->verdict.code = NFT_BREAK;
} }
static void nft_exthdr_sctp_eval(const struct nft_expr *expr, static void nft_exthdr_sctp_eval(const struct nft_expr *expr,
......
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