diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-07 14:40:53 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-07 14:40:53 +0100 |
| commit | 73c25fb139337ac4fe1695ae3c056961855594db (patch) | |
| tree | c4abc58ed32e41decdcb8fe72bf96ca465b08fd5 | |
| parent | 2c16d60332643e90d4fa244f4a706c454b8c7569 (diff) | |
| download | op-kernel-dev-73c25fb139337ac4fe1695ae3c056961855594db.zip op-kernel-dev-73c25fb139337ac4fe1695ae3c056961855594db.tar.gz | |
netfilter: nft_quota: allow to restore consumed quota
Allow to restore consumed quota, this is useful to restore the quota
state across reboots.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | net/netfilter/nft_quota.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/netfilter/nft_quota.c b/net/netfilter/nft_quota.c index 7f27ebd..bd6efc5 100644 --- a/net/netfilter/nft_quota.c +++ b/net/netfilter/nft_quota.c @@ -43,6 +43,7 @@ static inline void nft_quota_do_eval(struct nft_quota *priv, static const struct nla_policy nft_quota_policy[NFTA_QUOTA_MAX + 1] = { [NFTA_QUOTA_BYTES] = { .type = NLA_U64 }, [NFTA_QUOTA_FLAGS] = { .type = NLA_U32 }, + [NFTA_QUOTA_CONSUMED] = { .type = NLA_U64 }, }; #define NFT_QUOTA_DEPLETED_BIT 1 /* From NFT_QUOTA_F_DEPLETED. */ @@ -68,7 +69,7 @@ static int nft_quota_do_init(const struct nlattr * const tb[], struct nft_quota *priv) { unsigned long flags = 0; - u64 quota; + u64 quota, consumed = 0; if (!tb[NFTA_QUOTA_BYTES]) return -EINVAL; @@ -77,6 +78,12 @@ static int nft_quota_do_init(const struct nlattr * const tb[], if (quota > S64_MAX) return -EOVERFLOW; + if (tb[NFTA_QUOTA_CONSUMED]) { + consumed = be64_to_cpu(nla_get_be64(tb[NFTA_QUOTA_CONSUMED])); + if (consumed > quota) + return -EINVAL; + } + if (tb[NFTA_QUOTA_FLAGS]) { flags = ntohl(nla_get_be32(tb[NFTA_QUOTA_FLAGS])); if (flags & ~NFT_QUOTA_F_INV) @@ -87,7 +94,7 @@ static int nft_quota_do_init(const struct nlattr * const tb[], priv->quota = quota; priv->flags = flags; - atomic64_set(&priv->consumed, 0); + atomic64_set(&priv->consumed, consumed); return 0; } |
