upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4624-duration-error-checking-v9.18' into 'bind-9.18'

Browse source 
[9.18] Detect invalid durations

See merge request isc-projects/bind9!8864
This commit is contained in:
Matthijs Mekking 2024-03-14 11:12:15 +00:00
commit 5b9348f9bf
4 changed files with 61 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6361. [bug] Some invalid ISO 8601 durations were accepted
erroneously. [GL #4624]
6360. [bug] Don't return static-stub synthesised NS RRset.
[GL #4608]

25
bin/tests/system/checkconf/bad-kasp-duration.conf Normal file
View file

@ -0,0 +1,25 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
dnssec-policy "invalid-sigrefresh" {
keys {
csk lifetime unlimited algorithm 13;
};
signatures-refresh P7.5D;
};
zone "example.net" {
type primary;
file "example.db";
dnssec-policy "invalid-sigrefresh";
};

3
doc/notes/notes-current.rst
View file

@ -44,6 +44,9 @@ Bug Fixes
ISC would like to thank Thomas Amgarten for bringing this issue to
our attention. :gl:`#4518`, :gl:`#4528`
- Some ISO 8601 durations were accepted erroneously, leading to shorter
durations than expected. This has been fixed. :gl:`#4624`
Known Issues
~~~~~~~~~~~~

37
lib/isccfg/duration.c
View file

@ -45,6 +45,7 @@ isccfg_duration_fromtext(isc_textregion_t *source,
bool not_weeks = false;
int i;
long long int lli;
char *endptr;
/*
* Copy the buffer as it may not be NULL terminated.
@ -76,7 +77,11 @@ isccfg_duration_fromtext(isc_textregion_t *source,
X = strpbrk(str, "Yy");
if (X != NULL) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
endptr = NULL;
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -94,7 +99,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
*/
if (X != NULL && (T == NULL || (size_t)(X - P) < (size_t)(T - P))) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -107,7 +115,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
X = strpbrk(str, "Dd");
if (X != NULL) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -126,7 +137,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
X = strpbrk(str, "Hh");
if (X != NULL && T != NULL) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -144,7 +158,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
*/
if (X != NULL && T != NULL && (size_t)(X - P) > (size_t)(T - P)) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -157,7 +174,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
X = strpbrk(str, "Ss");
if (X != NULL && T != NULL) {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *X) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}
@ -174,7 +194,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
return (ISC_R_BADNUMBER);
} else {
errno = 0;
lli = strtoll(str + 1, NULL, 10);
lli = strtoll(str + 1, &endptr, 10);
if (*endptr != *W) {
return (ISC_R_BADNUMBER);
}
if (errno != 0 || lli < 0 || lli > UINT32_MAX) {
return (ISC_R_BADNUMBER);
}