diff options
author | Phil Sutter <phil@nwl.cc> | 2019-06-04 19:31:49 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-06 11:19:08 +0200 |
commit | 5c1c6028dbd54dd56e57fb8a18d1e7e61586e8bf (patch) | |
tree | ff008a36d30c67ab64d01eaed7c4ab19696abe15 | |
parent | 7df42800cf89e994b5179200825592d9b95c5fab (diff) |
src: Fix cache_flush() in cache_needs_more() logic
Commit 34a20645d54fa enabled cache updates depending on command causing
it. As a side-effect, this disabled measures in cache_flush() preventing
a later cache update. Re-establish this by setting cache->cmd in
addition to cache->genid after dropping cache entries.
While being at it, set cache->cmd in cache_release() as well. This
shouldn't be necessary since zeroing cache->genid should suffice for
cache_update(), but better be consistent (and future-proof) here.
Fixes: eeda228c2d17 ("src: update cache if cmd is more specific")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/rule.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -299,12 +299,15 @@ void cache_flush(struct nft_ctx *nft, enum cmd_ops cmd, struct list_head *msgs) __cache_flush(&cache->list); cache->genid = mnl_genid_get(&ctx); + cache->cmd = CMD_LIST; } void cache_release(struct nft_cache *cache) { __cache_flush(&cache->list); cache->genid = 0; + cache->cmd = CMD_INVALID; + } /* internal ID to uniquely identify a set in the batch */ |