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

[master] address overflow in retry backoff

Browse source 
4877.	[bug]		Address integer overflow when exponentially
			backing off retry intervals. [RT #47041]
This commit is contained in:
Mark Andrews 2018-01-24 09:45:01 -08:00 committed by Evan Hunt
parent b575c4ec42
commit 8b440753b6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4877. [bug] Address integer overflow when exponentially
backing off retry intervals. [RT #47041]
4876. [bug] Address deadlock with accessing a keytable. [RT #47000]
4875. [bug] Address compile failures on older systems. [RT #47015]

8
lib/dns/resolver.c
View file

@ -1810,8 +1810,12 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
/*
* Exponential backoff after the first few tries.
*/
if (fctx->restarts > fctx->res->nonbackofftries)
us <<= (fctx->restarts - fctx->res->nonbackofftries);
if (fctx->restarts > fctx->res->nonbackofftries) {
int shift = fctx->restarts - fctx->res->nonbackofftries;
if (shift > 6)
shift = 6;
us <<= shift;
}
/*
* Add a fudge factor to the expected rtt based on the current