Unverified Commit 0a251b5e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7253 netfilter: nf_tables: disallow timeout for anonymous sets 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4WU3GZAFZ4NI2LYDHBS6V6H76TG7WXHC/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9AK6C 
 
Link:https://gitee.com/openeuler/kernel/pulls/7253

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1df0d53c 6c483e6d

net/netfilter/nf_tables_api.c

+7 −0
Original line number Diff line number Diff line
@@ -4399,6 +4399,9 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, 
		if (!(flags & NFT_SET_TIMEOUT))

			return -EINVAL;



		if (flags & NFT_SET_ANONYMOUS)

			return -EOPNOTSUPP;



		err = nf_msecs_to_jiffies64(nla[NFTA_SET_TIMEOUT], &timeout);

		if (err)

			return err;
@@ -4407,6 +4410,10 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, 
	if (nla[NFTA_SET_GC_INTERVAL] != NULL) {

		if (!(flags & NFT_SET_TIMEOUT))

			return -EINVAL;



		if (flags & NFT_SET_ANONYMOUS)

			return -EOPNOTSUPP;



		gc_int = ntohl(nla_get_be32(nla[NFTA_SET_GC_INTERVAL]));

	}