From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nf-next 9/9] netfilter: nft_immediate: cancel register tracking for data destination register
Date: Sat, 12 Mar 2022 16:48:11 +0100 [thread overview]
Message-ID: <20220312154811.68611-10-pablo@netfilter.org> (raw)
In-Reply-To: <20220312154811.68611-1-pablo@netfilter.org>
The immediate expression might clobber existing data on the registers,
cancel register tracking for the destination register.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_immediate.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/net/netfilter/nft_immediate.c b/net/netfilter/nft_immediate.c
index d0f67d325bdf..daf1463ccdcb 100644
--- a/net/netfilter/nft_immediate.c
+++ b/net/netfilter/nft_immediate.c
@@ -223,6 +223,17 @@ static bool nft_immediate_offload_action(const struct nft_expr *expr)
return false;
}
+static bool nft_immediate_reduce(struct nft_regs_track *track,
+ const struct nft_expr *expr)
+{
+ const struct nft_immediate_expr *priv = nft_expr_priv(expr);
+
+ if (priv->dreg != NFT_REG_VERDICT)
+ __nft_reg_track_cancel(track, priv->dreg);
+
+ return false;
+}
+
static const struct nft_expr_ops nft_imm_ops = {
.type = &nft_imm_type,
.size = NFT_EXPR_SIZE(sizeof(struct nft_immediate_expr)),
@@ -233,6 +244,7 @@ static const struct nft_expr_ops nft_imm_ops = {
.destroy = nft_immediate_destroy,
.dump = nft_immediate_dump,
.validate = nft_immediate_validate,
+ .reduce = nft_immediate_reduce,
.offload = nft_immediate_offload,
.offload_action = nft_immediate_offload_action,
};
--
2.30.2
prev parent reply other threads:[~2022-03-12 15:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-12 15:48 [PATCH nf-next 0/9] register tracking infrastructure follow up Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 1/9] netfilter: nf_tables: do not reduce read-only expressions Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 2/9] netfilter: nf_tables: cancel tracking for clobbered destination registers Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 3/9] netfilter: nft_ct: track register operations Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 4/9] netfilter: nft_lookup: only cancel tracking for clobbered dregs Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 5/9] netfilter: nft_meta: extend reduce support to bridge family Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 6/9] netfilter: nft_numgen: cancel register tracking Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 7/9] netfilter: nft_osf: track register operations Pablo Neira Ayuso
2022-03-12 15:48 ` [PATCH nf-next 8/9] netfilter: nft_hash: " Pablo Neira Ayuso
2022-03-12 15:48 ` Pablo Neira Ayuso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220312154811.68611-10-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).