upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 19:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some issues with large journal entries

Browse source 
(cherry picked from commit 0db7130f2b)
(cherry picked from commit 1919f5c937)
This commit is contained in:
Witold Kręcicki 2018-06-26 21:06:55 +02:00 committed by Evan Hunt
parent 52013cbe27
commit e7506b6a70
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/dns/journal.c
View file

@ -1013,7 +1013,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
dns_difftuple_t *t;
isc_buffer_t buffer;
void *mem = NULL;
unsigned int size;
size_t size;
isc_result_t result;
isc_region_t used;
@ -1043,6 +1043,10 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
size += t->rdata.length;
}
if (size >= DNS_JOURNAL_SIZE_MAX) {
return (ISC_R_RANGE);
}
mem = isc_mem_get(j->mctx, size);
if (mem == NULL)
return (ISC_R_NOMEMORY);
@ -1145,6 +1149,18 @@ dns_journal_commit(dns_journal_t *j) {
}
}
/*
* We currently don't support huge journal entries.
*/
unsigned long long total = j->x.pos[1].offset - j->x.pos[0].offset;
if (total >= DNS_JOURNAL_SIZE_MAX) {
isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
"transaction too big to be stored in journal :"
"%llub (max is %llub)", total,
(unsigned long long)DNS_JOURNAL_SIZE_MAX);
return (ISC_R_UNEXPECTED);
}
/*
* Some old journal entries may become non-addressable
* when we increment the current serial number. Purge them
@ -1670,7 +1686,12 @@ read_one_rr(dns_journal_t *j) {
journal_xhdr_t xhdr;
journal_rrhdr_t rrhdr;
INSIST(j->offset <= j->it.epos.offset);
if (j->offset > j->it.epos.offset) {
isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
"%s: journal corrupt: possible integer overflow",
j->filename);
return (ISC_R_UNEXPECTED);
}
if (j->offset == j->it.epos.offset)
return (ISC_R_NOMORE);
if (j->it.xpos == j->it.xsize) {

7
lib/dns/zone.c
View file

@ -14281,6 +14281,13 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
result = dns_db_diff(zone->mctx, db, ver, zone->db, NULL,
zone->journal);
if (result == ISC_R_RANGE) {
dns_zone_log(zone, ISC_LOG_ERROR,
"ixfr-from-differences: failed: "
"difference too big to be stored "
"in journal");
goto fail;
}
if (result != ISC_R_SUCCESS)
goto fail;
if (dump)