Commit a49a03aa authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Guo Mengqi
Browse files

netfilter: nf_tables: disallow anonymous set with timeout flag 

mainline inclusion
from mainline-v6.8
commit 16603605b667b70da974bea8216c93e7db043bf1
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9AK56
CVE: CVE-2024-26642

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=16603605b667b70da974bea8216c93e7db043bf1



--------------------------------

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 avatarZiyang Xuan <william.xuanziyang@huawei.com>
parent 1df0d53c

net/netfilter/nf_tables_api.c

+3 −0
Original line number Diff line number Diff line
@@ -4358,6 +4358,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;