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

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

netfilter: nf_tables: disallow anonymous set with timeout flag 



commit 16603605b667b70da974bea8216c93e7db043bf1 upstream.

Anonymous sets are never used with timeout from userspace, reject this.
Exception to this rule is NFT_SET_EVAL to ensure legacy meters still work.

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

net/netfilter/nf_tables_api.c

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

			     (NFT_SET_EVAL | NFT_SET_OBJECT))

			return -EOPNOTSUPP;

		if ((flags & (NFT_SET_ANONYMOUS | NFT_SET_TIMEOUT | NFT_SET_EVAL)) ==

			     (NFT_SET_ANONYMOUS | NFT_SET_TIMEOUT))

			return -EOPNOTSUPP;

	}



	dtype = 0;