Commit 62e1e94b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: reject unbound chain set before commit phase 



Use binding list to track set transaction and to check for unbound
chains before entering the commit phase.

Bail out if chain binding remain unused before entering the commit
step.

Fixes: d0e2c7de ("netfilter: nf_tables: add NFT_CHAIN_BINDING")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 938154b9

net/netfilter/nf_tables_api.c

+13 −0
Original line number Diff line number Diff line
@@ -370,6 +370,11 @@ static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *tr 
		    nft_set_is_anonymous(nft_trans_set(trans)))

			list_add_tail(&trans->binding_list, &nft_net->binding_list);

		break;

	case NFT_MSG_NEWCHAIN:

		if (!nft_trans_chain_update(trans) &&

		    nft_chain_binding(nft_trans_chain(trans)))

			list_add_tail(&trans->binding_list, &nft_net->binding_list);

		break;

	}



	list_add_tail(&trans->list, &nft_net->commit_list);
@@ -9501,6 +9506,14 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) 
				return -EINVAL;

			}

			break;

		case NFT_MSG_NEWCHAIN:

			if (!nft_trans_chain_update(trans) &&

			    nft_chain_binding(nft_trans_chain(trans)) &&

			    !nft_trans_chain_bound(trans)) {

				pr_warn_once("nftables ruleset with unbound chain\n");

				return -EINVAL;

			}

			break;

		}

	}