mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '2191-missing-locks-when-accessing-keynode-initial-and-keynode-managed-triggering-tsan' into 'main'

Browse Source 
Resolve "Missing locks when accessing keynode.initial and keynode.managed triggered TSAN."

Closes #2191

See merge request isc-projects/bind9!4205
This commit is contained in:
Mark Andrews
2020-10-01 08:12:29 +00:00
parent 061fb5e07e 840cf7adb3
commit c969cf86e8
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/dns/keytable.c
View File

@@ -677,10 +677,12 @@ keynode_dslist_totext(dns_name_t *name, dns_keynode_t *keynode,
dns_secalg_format(ds.algorithm, algbuf, sizeof(algbuf)); dns_secalg_format(ds.algorithm, algbuf, sizeof(algbuf));
RWLOCK(&keynode->rwlock, isc_rwlocktype_read);
snprintf(obuf, sizeof(obuf), "%s/%s/%d ; %s%s\n", namebuf, snprintf(obuf, sizeof(obuf), "%s/%s/%d ; %s%s\n", namebuf,
algbuf, ds.key_tag, algbuf, ds.key_tag,
keynode->initial ? "initializing " : "", keynode->initial ? "initializing " : "",
keynode->managed ? "managed" : "static"); keynode->managed ? "managed" : "static");
RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read);
result = putstr(text, obuf); result = putstr(text, obuf);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -802,38 +804,56 @@ cleanup:
bool bool
dns_keynode_dsset(dns_keynode_t *keynode, dns_rdataset_t *rdataset) { dns_keynode_dsset(dns_keynode_t *keynode, dns_rdataset_t *rdataset) {
bool result;
REQUIRE(VALID_KEYNODE(keynode)); REQUIRE(VALID_KEYNODE(keynode));
REQUIRE(rdataset == NULL || DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset == NULL || DNS_RDATASET_VALID(rdataset));
RWLOCK(&keynode->rwlock, isc_rwlocktype_read);
if (keynode->dslist != NULL) { if (keynode->dslist != NULL) {
if (rdataset != NULL) { if (rdataset != NULL) {
keynode_clone(&keynode->dsset, rdataset); keynode_clone(&keynode->dsset, rdataset);
} }
return (true); result = true;
} else {
result = false;
} }
RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read);
return (false); return (result);
} }
bool bool
dns_keynode_managed(dns_keynode_t *keynode) { dns_keynode_managed(dns_keynode_t *keynode) {
bool managed;
REQUIRE(VALID_KEYNODE(keynode)); REQUIRE(VALID_KEYNODE(keynode));
return (keynode->managed); RWLOCK(&keynode->rwlock, isc_rwlocktype_read);
managed = keynode->managed;
RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read);
return (managed);
} }
bool bool
dns_keynode_initial(dns_keynode_t *keynode) { dns_keynode_initial(dns_keynode_t *keynode) {
bool initial;
REQUIRE(VALID_KEYNODE(keynode)); REQUIRE(VALID_KEYNODE(keynode));
return (keynode->initial); RWLOCK(&keynode->rwlock, isc_rwlocktype_read);
initial = keynode->initial;
RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read);
return (initial);
} }
void void
dns_keynode_trust(dns_keynode_t *keynode) { dns_keynode_trust(dns_keynode_t *keynode) {
REQUIRE(VALID_KEYNODE(keynode)); REQUIRE(VALID_KEYNODE(keynode));
RWLOCK(&keynode->rwlock, isc_rwlocktype_write);
keynode->initial = false; keynode->initial = false;
RWUNLOCK(&keynode->rwlock, isc_rwlocktype_write);
} }
static void static void