From ce5207699d9c37c46d29d91c295947443c425861 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 7 Jul 2021 15:47:59 +1000 Subject: [PATCH] Fix unchecked return of isc_rwlock_lock and isc_rwlock_unlock (cherry picked from commit bcaf23dd2799e30cfee1b5d39dec0fbc8e5f7193) --- bin/dnssec/dnssec-signzone.c | 6 +++--- lib/isc/rwlock.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index e321295684..6cea5138d2 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -126,7 +126,7 @@ struct signer_event { static dns_dnsseckeylist_t keylist; static unsigned int keycount = 0; -isc_rwlock_t keylist_lock; +static isc_rwlock_t keylist_lock; static isc_stdtime_t starttime = 0, endtime = 0, dnskey_endtime = 0, now; static int cycle = -1; static int jitter = 0; @@ -385,9 +385,9 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) { dst_key_t *pubkey = NULL, *privkey = NULL; dns_dnsseckey_t *key = NULL; - isc_rwlock_lock(&keylist_lock, isc_rwlocktype_read); + RWLOCK(&keylist_lock, isc_rwlocktype_read); key = keythatsigned_unlocked(rrsig); - isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_read); + RWUNLOCK(&keylist_lock, isc_rwlocktype_read); if (key != NULL) { return (key); } diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 7984a63042..9f732b3aaa 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -112,9 +112,12 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { void isc_rwlock_downgrade(isc_rwlock_t *rwl) { + isc_result_t result; atomic_store_release(&rwl->downgrade, true); - isc_rwlock_unlock(rwl, isc_rwlocktype_write); - isc_rwlock_lock(rwl, isc_rwlocktype_read); + result = isc_rwlock_unlock(rwl, isc_rwlocktype_write); + RUNTIME_CHECK(result == ISC_R_SUCCESS); + result = isc_rwlock_lock(rwl, isc_rwlocktype_read); + RUNTIME_CHECK(result == ISC_R_SUCCESS); atomic_store_release(&rwl->downgrade, false); }