From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
commit 917d80d376ffbaa9725fde9e3c0282f63643f278 upstream.
Use nf_msecs_to_jiffies64 and nf_jiffies64_to_msecs as provided by
8e1102d5a159 ("netfilter: nf_tables: support timeouts larger than 23
days"), otherwise ruleset listing breaks.
Fixes: a8b1e36d0d1d ("netfilter: nft_dynset: fix element timeout for HZ != 1000")
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/net/netfilter/nf_tables.h | 3 +++
net/netfilter/nf_tables_api.c | 4 ++--
net/netfilter/nft_dynset.c | 8 +++++---
3 files changed, 10 insertions(+), 5 deletions(-)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -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 */
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -3294,7 +3294,7 @@ cont:
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 s
return 0;
}
-static __be64 nf_jiffies64_to_msecs(u64 input)
+__be64 nf_jiffies64_to_msecs(u64 input)
{
u64 ms = jiffies64_to_nsecs(input);
--- a/net/netfilter/nft_dynset.c
+++ b/net/netfilter/nft_dynset.c
@@ -169,8 +169,10 @@ static int nft_dynset_init(const struct
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_buf
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))
Patches currently in stable-queue which might be from kroah.com@xxxxxxxxxxxxxxx are
queue-4.19/netfilter-nf_tables-bogus-ebusy-when-deleting-flowtable-after-flush-for-4.19.patch
queue-4.19/netfilter-nft_set_rbtree-switch-to-node-list-walk-for-overlap-detection.patch
queue-4.19/netfilter-nf_tables-validate-nfproto_-family.patch
queue-4.19/netfilter-nf_tables-unregister-flowtable-hooks-on-netns-exit.patch
queue-4.19/netfilter-nf_tables-fix-gc-transaction-races-with-netns-and-netlink-event-exit-path.patch
queue-4.19/netfilter-nft_set_rbtree-use-read-spinlock-to-avoid-datapath-contention.patch
queue-4.19/netfilter-nft_dynset-report-eopnotsupp-on-missing-set-feature.patch
queue-4.19/netfilter-nf_tables-discard-table-flag-update-with-pending-basechain-deletion.patch
queue-4.19/netfilter-nft_set_rbtree-skip-sync-gc-for-new-elements-in-this-transaction.patch
queue-4.19/netfilter-nf_tables-mark-set-as-dead-when-unbinding-anonymous-set-with-timeout.patch
queue-4.19/netfilter-nf_tables-reject-new-basechain-after-table-flag-update.patch
queue-4.19/netfilter-nf_tables-gc-transaction-race-with-netns-dismantle.patch
queue-4.19/netfilter-nftables-update-table-flags-from-the-commit-phase.patch
queue-4.19/netfilter-nf_tables-allow-nfproto_inet-in-nft_-match-target-_validate.patch
queue-4.19/netfilter-nft_set_rbtree-skip-end-interval-element-from-gc.patch
queue-4.19/netfilter-nf_tables-drop-map-element-references-from-preparation-phase.patch
queue-4.19/netfilter-nf_tables-gc-transaction-race-with-abort-path.patch
queue-4.19/netfilter-nf_tables-fix-memleak-when-more-than-255-elements-expired.patch
queue-4.19/netfilter-nft_set_rbtree-add-missing-expired-checks.patch
queue-4.19/netfilter-nf_tables-double-hook-unregistration-in-netns-path.patch
queue-4.19/netfilter-nft_dynset-relax-superfluous-check-on-set-updates.patch
queue-4.19/netfilter-nf_tables-defer-gc-run-if-previous-batch-is-still-pending.patch
queue-4.19/netfilter-nft_set_hash-try-later-when-gc-hits-eagain-on-iteration.patch
queue-4.19/netfilter-nft_dynset-fix-timeouts-later-than-23-days.patch
queue-4.19/netfilter-nf_tables-mark-newset-as-dead-on-transaction-abort.patch
queue-4.19/netfilter-nf_tables-don-t-skip-expired-elements-during-walk.patch
queue-4.19/netfilter-nftables-rename-set-element-data-activation-deactivation-functions.patch
queue-4.19/netfilter-nf_tables-gc-transaction-api-to-avoid-race-with-control-plane.patch
queue-4.19/netfilter-nf_tables-set-dormant-flag-on-hook-register-failure.patch
queue-4.19/netfilter-nf_tables-remove-busy-mark-and-gc-batch-api.patch
queue-4.19/netfilter-nf_tables-skip-dead-set-elements-in-netlink-dump.patch
queue-4.19/netfilter-nf_tables-adapt-set-backend-to-use-gc-transaction-api.patch
queue-4.19/netfilter-nft_set_rbtree-fix-overlap-expiration-walk.patch
queue-4.19/netfilter-nf_tables-fix-table-flag-updates.patch
queue-4.19/netfilter-nf_tables-do-not-compare-internal-table-flags-on-updates.patch
queue-4.19/netfilter-nft_set_rbtree-allow-loose-matching-of-closing-element-in-interval.patch
queue-4.19/netfilter-nftables-exthdr-fix-4-byte-stack-oob-write.patch
queue-4.19/netfilter-nft_set_rbtree-fix-null-deref-on-element-insertion.patch
queue-4.19/netfilter-nf_tables-pass-context-to-nft_set_destroy.patch
queue-4.19/netfilter-nf_tables-disable-toggling-dormant-table-state-more-than-once.patch
