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

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

netfilter: nft_dynset: fix timeouts later than 23 days 



commit 917d80d376ffbaa9725fde9e3c0282f63643f278 upstream.

Use nf_msecs_to_jiffies64 and nf_jiffies64_to_msecs as provided by
8e1102d5 ("netfilter: nf_tables: support timeouts larger than 23
days"), otherwise ruleset listing breaks.

Fixes: a8b1e36d ("netfilter: nft_dynset: fix element timeout for HZ != 1000")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a118e0d8

include/net/netfilter/nf_tables.h

+3 −0
Original line number Diff line number Diff line
@@ -1423,4 +1423,7 @@ struct nftables_pernet { 
	unsigned int		gc_seq;

};



int nf_msecs_to_jiffies64(const struct nlattr *nla, u64 *result);

__be64 nf_jiffies64_to_msecs(u64 input);



#endif /* _NET_NF_TABLES_H */

net/netfilter/nf_tables_api.c

+2 −2
Original line number Diff line number Diff line
@@ -3294,7 +3294,7 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, 
	return 0;

}



static int nf_msecs_to_jiffies64(const struct nlattr *nla, u64 *result)

int nf_msecs_to_jiffies64(const struct nlattr *nla, u64 *result)

{

	u64 ms = be64_to_cpu(nla_get_be64(nla));

	u64 max = (u64)(~((u64)0));
@@ -3308,7 +3308,7 @@ static int nf_msecs_to_jiffies64(const struct nlattr *nla, u64 *result) 
	return 0;

}



static __be64 nf_jiffies64_to_msecs(u64 input)

__be64 nf_jiffies64_to_msecs(u64 input)

{

	u64 ms = jiffies64_to_nsecs(input);

net/netfilter/nft_dynset.c

+5 −3
Original line number Diff line number Diff line
@@ -169,8 +169,10 @@ static int nft_dynset_init(const struct nft_ctx *ctx, 
	if (tb[NFTA_DYNSET_TIMEOUT] != NULL) {

		if (!(set->flags & NFT_SET_TIMEOUT))

			return -EINVAL;

		timeout = msecs_to_jiffies(be64_to_cpu(nla_get_be64(

						tb[NFTA_DYNSET_TIMEOUT])));



		err = nf_msecs_to_jiffies64(tb[NFTA_DYNSET_TIMEOUT], &timeout);

		if (err)

			return err;

	}



	err = nft_parse_register_load(tb[NFTA_DYNSET_SREG_KEY], &priv->sreg_key,
@@ -284,7 +286,7 @@ static int nft_dynset_dump(struct sk_buff *skb, const struct nft_expr *expr) 
	if (nla_put_string(skb, NFTA_DYNSET_SET_NAME, priv->set->name))

		goto nla_put_failure;

	if (nla_put_be64(skb, NFTA_DYNSET_TIMEOUT,

			 cpu_to_be64(jiffies_to_msecs(priv->timeout)),

			 nf_jiffies64_to_msecs(priv->timeout),

			 NFTA_DYNSET_PAD))

		goto nla_put_failure;

	if (priv->expr && nft_expr_dump(skb, NFTA_DYNSET_EXPR, priv->expr))