netfilter: nft_last: honor NFTA_LAST_SET on restoration
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nft_last: honor NFTA_LAST_SET on restoration
NFTA_LAST_SET tells us if this expression has ever seen a packet, do not ignore this attribute when restoring the ruleset.
Fixes 836382dc2471 ("netfilter: nf_tables: add last expression")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_last.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/netfilter/nft_last.c +8 -2
@@ -23,15 +23,21 @@ static int nft_last_init(const struct nft_ctx *ctx, const struct nft_expr *expr, {struct nft_last_priv *priv =nft_expr_priv (expr);u64 last_jiffies; +u32 last_set =0 ;int err; -if (tb[NFTA_LAST_MSECS ]) { +if (tb[NFTA_LAST_SET ]) { + last_set =ntohl (nla_get_be32 (tb[NFTA_LAST_SET ])); +if (last_set ==1 ) + priv->last_set =1 ; + } + +if (last_set && tb[NFTA_LAST_MSECS ]) { err =nf_msecs_to_jiffies64 (tb[NFTA_LAST_MSECS ], &last_jiffies);if (err <0 )return err; priv->last_jiffies = jiffies + (unsigned long )last_jiffies; - priv->last_set =1 ; }return 0 ;
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nft_last: incorrect arithmetics when restoring last used
Subtract the jiffies that have passed by to current jiffies to fix last used restoration.
Fixes 836382dc2471 ("netfilter: nf_tables: add last expression")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_last.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_last.c +1 -1
@@ -37,7 +37,7 @@ static int nft_last_init(const struct nft_ctx *ctx, const struct nft_expr *expr,if (err <0 )return err; - priv->last_jiffies = jiffies + (unsigned long )last_jiffies; + priv->last_jiffies = jiffies - (unsigned long )last_jiffies; }return 0 ;
Signature · 1 line
2.20.1