rule: ensure cache consistency
Pablo Neira Ayuso
maintainerPATCH 1/1 rule: ensure cache consistency
Check for generation ID after the cache is populated. In case of interference, release the inconsistent cache and retry.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/rule.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
src/rule.c +9 -3
@@ -244,8 +244,6 @@ static bool cache_is_updated(struct nft_cache *cache, uint16_t genid)int cache_update (struct nft_ctx *nft,enum cmd_ops cmd,struct list_head *msgs) { -uint16_t genid; -int ret;struct netlink_ctx ctx = { .list =LIST_HEAD_INIT (ctx.list), .nft = nft,
@@ -253,7 +251,8 @@ int cache_update(struct nft_ctx *nft, enum cmd_ops cmd, struct list_head *msgs) .nft = nft, };struct nft_cache *cache = &nft->cache; - +uint16_t genid, genid_stop; +int ret; replay: ctx.seqnum = cache->seqnum++; genid =mnl_genid_get (&ctx);
@@ -273,6 +272,13 @@ replay: }return -1 ; } + + genid_stop =mnl_genid_get (&ctx); +if (genid != genid_stop) { +cache_release (cache); + goto replay; + } + cache->genid = genid; cache->cmd = cmd;return 0 ;
Signature · 1 line
2.11.0