Don't erase key from s_new_ce_keys on eviction

Erasing a key from s_new_ce_keys is equivalent to destroying it, so it
shouldn't be done when the key is merely being evicted.

This didn't matter in practice since eviction requests don't come in
before the key gets persisted, but fix this to avoid confusion.

Ignore-AOSP-First: Conflicts. Will cherry-pick after Android 14 push...
Test: see I7f11a135d8550618cd96013f834cebd54be5ef84
Change-Id: I28412f243925b5a7242449b617fe9de9c90912b6
This commit is contained in:
Eric Biggers 2023-08-02 23:02:22 +00:00
parent ce86e24d23
commit 3529302ede

View file

@ -680,7 +680,6 @@ static bool evict_ce_key(userid_t user_id) {
drop_caches_if_needed(); drop_caches_if_needed();
} }
s_ce_policies.erase(user_id); s_ce_policies.erase(user_id);
s_new_ce_keys.erase(user_id);
return success; return success;
} }