NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: nf_tables: fix nft_trans type confusion

Browse source 
[ Upstream commit e3c361b8acd636f5fe80c02849ca175201edf10c ]

nft_trans_FOO objects all share a common nft_trans base structure, but
trailing fields depend on the real object size. Access is only safe after
trans->msg_type check.

Check for rule type first.  Found by code inspection.

Fixes: 1a94e38d25 ("netfilter: nf_tables: add NFTA_RULE_ID attribute")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Florian Westphal 2023-05-11 14:15:15 +02:00 • committed by Greg Kroah-Hartman
parent d862b63605
commit 8f58c53857
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/netfilter/nf_tables_api.c
View file

@ -3692,12 +3692,10 @@ static struct nft_rule *nft_rule_lookup_byid(const struct net *net,
struct nft_trans *trans; struct nft_trans *trans;
list_for_each_entry(trans, &nft_net->commit_list, list) { list_for_each_entry(trans, &nft_net->commit_list, list) {
struct nft_rule *rule = nft_trans_rule(trans);
if (trans->msg_type == NFT_MSG_NEWRULE && if (trans->msg_type == NFT_MSG_NEWRULE &&
trans->ctx.chain == chain && trans->ctx.chain == chain &&
id == nft_trans_rule_id(trans)) id == nft_trans_rule_id(trans))
return rule; return nft_trans_rule(trans);
} }
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }