Skip to contentSkip to conversation

netfilter: nft_queue: only allow supported families

PATCH In review Florian Westphal 2 participants 3 messages Jul 26, 2022

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 netfilter: nft_queue: only allow supported families

Trying to use 'queue' statement in ingress (for example) triggers a splat on reinject:

WARNING: CPU: 3 PID: 1345 at net/netfilter/nf_queue.c:291

... because nf_reinject cannot find the ruleset head, so all "reinject" attempts result in packet drop.

Ingress/egress do not support async resume at the moment anyway, so disallow loading such rulesets with a more appropriate error message.

---
 net/netfilter/nft_queue.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
net/netfilter/nft_queue.c +24 -0
index 15e4b7640dc0..cb54a0a4b424 100644
@@ -75,6 +75,24 @@ static const struct nla_policy nft_queue_policy[NFTA_QUEUE_MAX + 1] = {
 	[NFTA_QUEUE_SREG_QNUM]	= { .type = NLA_U32 },
 };
 
+static bool nft_queue_family_supported(const struct nft_ctx *ctx)
+{
+	switch (ctx->family) {
+	case NFPROTO_IPV4:
+	case NFPROTO_IPV6:
+	case NFPROTO_INET:
+	case NFPROTO_BRIDGE:
+		return true;
+	case NFPROTO_ARP:
+	case NFPROTO_DECNET:
+	case NFPROTO_NETDEV:
+	default:
+		break;
+	}
+
+	return false;
+}
+
 static int nft_queue_init(const struct nft_ctx *ctx,
 			  const struct nft_expr *expr,
 			  const struct nlattr * const tb[])
@@ -82,6 +100,9 @@ static int nft_queue_init(const struct nft_ctx *ctx,
 	struct nft_queue *priv = nft_expr_priv(expr);
 	u32 maxid;
 
+	if (!nft_queue_family_supported(ctx))
+		return -EOPNOTSUPP;
+
 	priv->queuenum = ntohs(nla_get_be16(tb[NFTA_QUEUE_NUM]));
 
 	if (tb[NFTA_QUEUE_TOTAL])
@@ -111,6 +132,9 @@ static int nft_queue_sreg_init(const struct nft_ctx *ctx,
 	struct nft_queue *priv = nft_expr_priv(expr);
 	int err;
 
+	if (!nft_queue_family_supported(ctx))
+		return -EOPNOTSUPP;
+
 	err = nft_parse_register_load(tb[NFTA_QUEUE_SREG_QNUM],
 				      &priv->sreg_qnum, sizeof(u32));
 	if (err < 0)
Signature · 1 line
2.35.1
#1 lore raw
Quoted 22 lines · Florian Westphal

Trying to use 'queue' statement in ingress (for example) triggers a splat on reinject:

WARNING: CPU: 3 PID: 1345 at net/netfilter/nf_queue.c:291

... because nf_reinject cannot find the ruleset head, so all "reinject" attempts result in packet drop.

Ingress/egress do not support async resume at the moment anyway, so disallow loading such rulesets with a more appropriate error message.

---
 net/netfilter/nft_queue.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
net/netfilter/nft_queue.c +0 -0
index 15e4b7640dc0..cb54a0a4b424 100644

net/netfilter/nft_queue.c static const struct nla_policy nft_queue_policy[NFTA_QUEUE_MAX + 1] = { · line 83

Quoted 9 lines
net/netfilter/nft_queue.c +6 -0
@@ -75,6 +75,24 @@ static const struct nla_policy nft_queue_policy[NFTA_QUEUE_MAX + 1] = {
 	[NFTA_QUEUE_SREG_QNUM]	= { .type = NLA_U32 },
 };
 
+static bool nft_queue_family_supported(const struct nft_ctx *ctx)
+{
+	switch (ctx->family) {
+	case NFPROTO_IPV4:
+	case NFPROTO_IPV6:
+	case NFPROTO_INET:

there is a special inet/ingress, maybe it requires a sanity check here?

net/netfilter/nft_queue.c static int nft_queue_init(const struct nft_ctx *ctx,

Quoted 16 lines
net/netfilter/nft_queue.c +12 -0
+	case NFPROTO_BRIDGE:
+		return true;
+	case NFPROTO_ARP:
+	case NFPROTO_DECNET:
+	case NFPROTO_NETDEV:
+	default:
+		break;
+	}
+
+	return false;
+}
+
 static int nft_queue_init(const struct nft_ctx *ctx,
 			  const struct nft_expr *expr,
 			  const struct nlattr * const tb[])
@@ -82,6 +100,9 @@ static int nft_queue_init(const struct nft_ctx *ctx,

Maybe .validate is a better place for this?

Quoted 22 lines
net/netfilter/nft_queue.c +6 -0
 	struct nft_queue *priv = nft_expr_priv(expr);
 	u32 maxid;
 
+	if (!nft_queue_family_supported(ctx))
+		return -EOPNOTSUPP;
+
 	priv->queuenum = ntohs(nla_get_be16(tb[NFTA_QUEUE_NUM]));
 
 	if (tb[NFTA_QUEUE_TOTAL])
@@ -111,6 +132,9 @@ static int nft_queue_sreg_init(const struct nft_ctx *ctx,
 	struct nft_queue *priv = nft_expr_priv(expr);
 	int err;
 
+	if (!nft_queue_family_supported(ctx))
+		return -EOPNOTSUPP;
+
 	err = nft_parse_register_load(tb[NFTA_QUEUE_SREG_QNUM],
 				      &priv->sreg_qnum, sizeof(u32));
 	if (err < 0)
Signature · 1 line
2.35.1
author maintainer
#2 lore raw
Quoted 3 lines · Pablo Neira Ayuso

net/netfilter/nft_queue.c static const struct nla_policy nft_queue_policy[NFTA_QUEUE_MAX + 1] = { · line 83

Quoted 1 line
net/netfilter/nft_queue.c +1 -0
+	case NFPROTO_INET:

there is a special inet/ingress, maybe it requires a sanity check here?

Right, this patch allows 'inet+ingress', whoch doesn't work either.

Quoted 6 lines

net/netfilter/nft_queue.c static int nft_queue_init(const struct nft_ctx *ctx,

Quoted 4 lines

static int nft_queue_init(const struct nft_ctx *ctx,

net/netfilter/nft_queue.c +0 -0
 			  const struct nft_expr *expr,
 			  const struct nlattr * const tb[])
@@ -82,6 +100,9 @@ static int nft_queue_init(const struct nft_ctx *ctx,

Maybe .validate is a better place for this?

Yep, I sent a v2.