summaryrefslogtreecommitdiff
path: root/net/netfilter/nft_meta.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-06-13 13:13:38 -0700
committerJakub Kicinski <kuba@kernel.org>2024-06-13 13:13:46 -0700
commit4c7d3d79c736186bb2585f2d0a8231e1fac839da (patch)
tree5abd973d57d360e24c9df2f17e942176ab2faaa5 /net/netfilter/nft_meta.c
parent3ec8d7572a69d142d49f52b28ce8d84e5fef9131 (diff)
parentd20f6b3d747c36889b7ce75ee369182af3decb6b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. No conflicts, no adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/netfilter/nft_meta.c')
-rw-r--r--net/netfilter/nft_meta.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index ba0d3683a45d..9139ce38ea7b 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -839,6 +839,9 @@ static int nft_meta_inner_init(const struct nft_ctx *ctx,
struct nft_meta *priv = nft_expr_priv(expr);
unsigned int len;
+ if (!tb[NFTA_META_KEY] || !tb[NFTA_META_DREG])
+ return -EINVAL;
+
priv->key = ntohl(nla_get_be32(tb[NFTA_META_KEY]));
switch (priv->key) {
case NFT_META_PROTOCOL: