upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: dev: Only unlink from SIEVE LRU if it is still linked

Browse source 
Under the overmem conditions, the header could get unlinked from the
SIEVE LRU using a different path.  This could lead to double-unlink
which causes assertion failure.  Add a guard to ISC_SIEVE_UNLINK() to
unlink only still linked headers.

Closes #5606

Merge branch '5606-fix-assertion-failure-in-overmem-cleaning' into 'main'

See merge request isc-projects/bind9!11166
This commit is contained in:
Ondřej Surý 2025-11-04 19:53:09 +01:00
commit 28926f210e
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/dns/qpcache.c
View file

@ -504,7 +504,9 @@ expire_lru_headers(qpcache_t *qpdb, uint32_t idx, size_t requested,
dns_slabtop_t *related = top->related;
ISC_SIEVE_UNLINK(qpdb->buckets[idx].sieve, top, link);
if (ISC_SIEVE_LINKED(top, link)) {
ISC_SIEVE_UNLINK(qpdb->buckets[idx].sieve, top, link);
}
dns_slabheader_t *header = first_header(top);
expired += expireheader(header, nlocktypep, tlocktypep,
@ -615,7 +617,7 @@ clean_cache_node(qpcache_t *qpdb, qpcnode_t *node) {
cds_list_del(&top->types_link);
if (ISC_LINK_LINKED(top, link)) {
if (ISC_SIEVE_LINKED(top, link)) {
ISC_SIEVE_UNLINK(
qpdb->buckets[node->locknum].sieve, top,
link);
@ -2901,8 +2903,10 @@ add(qpcache_t *qpdb, qpcnode_t *qpnode, dns_slabheader_t *newheader,
cds_list_add(&newheader->headers_link,
&oldheader->top->headers);
ISC_SIEVE_UNLINK(qpdb->buckets[qpnode->locknum].sieve,
oldheader->top, link);
if (ISC_SIEVE_LINKED(oldheader->top, link)) {
ISC_SIEVE_UNLINK(qpdb->buckets[qpnode->locknum].sieve,
oldheader->top, link);
}
qpcache_miss(qpdb, newheader, &nlocktype,
&tlocktype DNS__DB_FLARG_PASS);
@ -3889,7 +3893,7 @@ qpcnode_destroy(qpcnode_t *qpnode) {
dns_slabheader_destroy(&header);
}
if (ISC_LINK_LINKED(top, link)) {
if (ISC_SIEVE_LINKED(top, link)) {
ISC_SIEVE_UNLINK(qpdb->buckets[qpnode->locknum].sieve,
top, link);
}

2
lib/isc/include/isc/sieve.h
View file

@ -143,6 +143,8 @@
__hand; \
})
#define ISC_SIEVE_LINKED(entry, link) ISC_LINK_LINKED(entry, link)
#define ISC_SIEVE_UNLINK(sieve, entry, link) \
({ \
__typeof__((sieve).hand) __hand = (sieve).hand; \