mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

4766. [cleanup] Addresss Coverity warnings. [RT #46150]

Browse Source 
4765.   [bug]           Address potential INSIST in dnssec-cds. [RT #46150]
This commit is contained in:
Mark Andrews
2017-10-09 18:34:31 +11:00
parent 2d22725336
commit 5df3f839b2
4 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
4766. [cleanup] Addresss Coverity warnings. [RT #46150]
4765. [bug] Address potential INSIST in dnssec-cds. [RT #46150]
4764. [bug] Address portability issues in cds system test. 4764. [bug] Address portability issues in cds system test.
[RT #46214] [RT #46214]

25
bin/dnssec/dnssec-cds.c
View File

@@ -360,13 +360,14 @@ load_parent_set(const char *path) {
free_db(&db, &node); free_db(&db, &node);
} }
#define MAX_CDS_RDATA_TEXT_SIZE DNS_RDATA_MAXLENGTH * 2
static isc_buffer_t * static isc_buffer_t *
formatset(dns_rdataset_t *rdataset) { formatset(dns_rdataset_t *rdataset) {
isc_result_t result; isc_result_t result;
isc_buffer_t *buf = NULL; isc_buffer_t *buf = NULL;
dns_master_style_t *style = NULL; dns_master_style_t *style = NULL;
unsigned int styleflags; unsigned int styleflags;
unsigned int size;
styleflags = (rdataset->ttl == 0) ? DNS_STYLEFLAG_NO_TTL : 0; styleflags = (rdataset->ttl == 0) ? DNS_STYLEFLAG_NO_TTL : 0;
@@ -378,23 +379,17 @@ formatset(dns_rdataset_t *rdataset) {
result = dns_master_stylecreate2(&style, styleflags, result = dns_master_stylecreate2(&style, styleflags,
0, 0, 0, 0, 0, 1000000, 0, 0, 0, 0, 0, 0, 1000000, 0,
mctx); mctx);
check_result(result, "dns_master_stylecreate2 failed");
size = 256; result = isc_buffer_allocate(mctx, &buf, MAX_CDS_RDATA_TEXT_SIZE);
do {
result = isc_buffer_allocate(mctx, &buf, size);
check_result(result, "printing DS records"); check_result(result, "printing DS records");
result = dns_master_rdatasettotext(name, rdataset, result = dns_master_rdatasettotext(name, rdataset, style, buf);
style, buf);
if (result == ISC_R_NOSPACE || if ((result == ISC_R_SUCCESS) && isc_buffer_availablelength(buf) < 1) {
isc_buffer_availablelength(buf) < 1) result = ISC_R_NOSPACE;
{
vbprintf(20, "formatset buffer size %u\n", size);
isc_buffer_free(&buf);
size *= 2;
} else {
check_result(result, "dns_rdataset_totext()");
} }
} while (result != ISC_R_SUCCESS);
check_result(result, "dns_rdataset_totext()");
isc_buffer_putuint8(buf, 0); isc_buffer_putuint8(buf, 0);

1
lib/irs/getnameinfo.c
View File

@@ -320,6 +320,7 @@ getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
case DNS_R_NOVALIDDS: case DNS_R_NOVALIDDS:
case DNS_R_NOVALIDSIG: case DNS_R_NOVALIDSIG:
ERR(EAI_INSECUREDATA); ERR(EAI_INSECUREDATA);
/* NOTREACHED */
default: default:
ERR(EAI_FAIL); ERR(EAI_FAIL);
} }

12
lib/ns/query.c
View File

@@ -8353,7 +8353,6 @@ query_synthnodata(query_ctx_t *qctx, const dns_name_t *signer,
dns_ttl_t ttl; dns_ttl_t ttl;
isc_buffer_t *dbuf, b; isc_buffer_t *dbuf, b;
isc_result_t result; isc_result_t result;
dns_rdataset_t *clone = NULL, *sigclone = NULL;
/* /*
* Detemine the correct TTL to use for the SOA and RRSIG * Detemine the correct TTL to use for the SOA and RRSIG
@@ -8413,12 +8412,6 @@ cleanup:
if (name != NULL) { if (name != NULL) {
query_releasename(qctx->client, &name); query_releasename(qctx->client, &name);
} }
if (clone != NULL) {
query_putrdataset(qctx->client, &clone);
}
if (sigclone != NULL) {
query_putrdataset(qctx->client, &sigclone);
}
return (result); return (result);
} }
@@ -8746,7 +8739,6 @@ query_coveringnsec(query_ctx_t *qctx) {
dns_fixedname_t fsigner; dns_fixedname_t fsigner;
dns_fixedname_t fwild; dns_fixedname_t fwild;
dns_name_t *fname = NULL; dns_name_t *fname = NULL;
dns_name_t *name = NULL;
dns_name_t *nowild = NULL; dns_name_t *nowild = NULL;
dns_name_t *signer = NULL; dns_name_t *signer = NULL;
dns_name_t *wild = NULL; dns_name_t *wild = NULL;
@@ -8891,6 +8883,7 @@ query_coveringnsec(query_ctx_t *qctx) {
{ {
goto cleanup; goto cleanup;
} }
/* FALLTHROUGH */
case DNS_R_CNAME: case DNS_R_CNAME:
if (!qctx->resuming && !STALE(&rdataset) && if (!qctx->resuming && !STALE(&rdataset) &&
rdataset.ttl == 0 && RECURSIONOK(qctx->client)) rdataset.ttl == 0 && RECURSIONOK(qctx->client))
@@ -8997,9 +8990,6 @@ query_coveringnsec(query_ctx_t *qctx) {
} }
dns_db_detach(&db); dns_db_detach(&db);
} }
if (name != NULL) {
query_releasename(qctx->client, &name);
}
if (redirected) { if (redirected) {
return (result); return (result);