upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-03 22:08:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '2807-coverity-reports-use-of-tainted-scalar' into 'main'

Browse source 
Resolve "Coverity reports use of tainted scalar"

Closes #2807

See merge request isc-projects/bind9!5249
This commit is contained in:
Mark Andrews 2021-07-12 00:42:27 +00:00
commit ad17419313
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/dns/journal.c
View file

@ -2043,6 +2043,14 @@ read_one_rr(dns_journal_t *j) {
ttl = isc_buffer_getuint32(&j->it.source);
rdlen = isc_buffer_getuint16(&j->it.source);
if (rdlen > DNS_RDATA_MAXLENGTH) {
isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
"%s: journal corrupt: impossible rdlen "
"(%u bytes)",
j->filename, rdlen);
FAIL(ISC_R_FAILURE);
}
/*
* Parse the rdata.
*/
@ -2613,6 +2621,14 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial,
CHECK(result);
size = xhdr.size;
if (size > len) {
isc_log_write(JOURNAL_COMMON_LOGARGS,
ISC_LOG_ERROR,
"%s: journal file corrupt, "
"transaction too large",
j1->filename);
CHECK(ISC_R_FAILURE);
}
buf = isc_mem_get(mctx, size);
result = journal_read(j1, buf, size);
@ -2637,6 +2653,15 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial,
/* Check again */
isc_mem_put(mctx, buf, size);
size = xhdr.size;
if (size > len) {
isc_log_write(
JOURNAL_COMMON_LOGARGS,
ISC_LOG_ERROR,
"%s: journal file corrupt, "
"transaction too large",
j1->filename);
CHECK(ISC_R_FAILURE);
}
buf = isc_mem_get(mctx, size);
CHECK(journal_read(j1, buf, size));