Skip to content

Commit a549faa

Browse files
ummakynesFishwaldo
authored andcommitted
netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
[ Upstream commit 0ebc106 ] Bail out with EOPNOTSUPP when adding rule to bound chain via NFTA_RULE_CHAIN_ID. The following warning splat is shown when adding a rule to a deleted bound chain: WARNING: CPU: 2 PID: 13692 at net/netfilter/nf_tables_api.c:2013 nf_tables_chain_destroy+0x1f7/0x210 [nf_tables] CPU: 2 PID: 13692 Comm: chain-bound-rul Not tainted 6.1.39 #1 RIP: 0010:nf_tables_chain_destroy+0x1f7/0x210 [nf_tables] Fixes: d0e2c7d ("netfilter: nf_tables: add NFT_CHAIN_BINDING") Reported-by: Kevin Rich <kevinrich1337@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 12564ad commit a549faa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3529,8 +3529,6 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,
35293529
NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_CHAIN]);
35303530
return PTR_ERR(chain);
35313531
}
3532-
if (nft_chain_is_bound(chain))
3533-
return -EOPNOTSUPP;
35343532

35353533
} else if (nla[NFTA_RULE_CHAIN_ID]) {
35363534
chain = nft_chain_lookup_byid(net, table, nla[NFTA_RULE_CHAIN_ID],
@@ -3543,6 +3541,9 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,
35433541
return -EINVAL;
35443542
}
35453543

3544+
if (nft_chain_is_bound(chain))
3545+
return -EOPNOTSUPP;
3546+
35463547
if (nla[NFTA_RULE_HANDLE]) {
35473548
handle = be64_to_cpu(nla_get_be64(nla[NFTA_RULE_HANDLE]));
35483549
rule = __nft_rule_lookup(chain, handle);

0 commit comments

Comments
 (0)