Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9372a64f authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: reject constant set with timeout 



commit 5f4fc4bd5cddb4770ab120ce44f02695c4505562 upstream.

This set combination is weird: it allows for elements to be
added/deleted, but once bound to the rule it cannot be updated anymore.
Eventually, all elements expire, leading to an empty set which cannot
be updated anymore. Reject this flags combination.

Cc: stable@vger.kernel.org
Fixes: 761da293 ("netfilter: nf_tables: add set timeout API support")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4988d84

net/netfilter/nf_tables_api.c

+3 −0
Original line number Diff line number Diff line
@@ -3563,6 +3563,9 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, 
		if ((flags & (NFT_SET_ANONYMOUS | NFT_SET_TIMEOUT | NFT_SET_EVAL)) ==

			     (NFT_SET_ANONYMOUS | NFT_SET_TIMEOUT))

			return -EOPNOTSUPP;

		if ((flags & (NFT_SET_CONSTANT | NFT_SET_TIMEOUT)) ==

			     (NFT_SET_CONSTANT | NFT_SET_TIMEOUT))

			return -EOPNOTSUPP;

	}



	dtype = 0;