diff options
| -rw-r--r-- | bind.spec | 8 | ||||
| -rw-r--r-- | bind97-rh507429.patch | 33 |
2 files changed, 40 insertions, 1 deletions
@@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.7.0 -Release: 7.%{PATCHVER}%{?dist} +Release: 8.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,7 @@ Patch106:bind93-rh490837.patch Patch107:bind97-dist-pkcs11.patch Patch108:bind97-managed-keyfile.patch Patch109:bind97-rh478718.patch +Patch110:bind97-rh507429.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -241,6 +242,7 @@ mkdir m4 %patch106 -p0 -b .rh490837 %patch107 -p1 -b .dist-pkcs11 %patch109 -p1 -b .rh478718 +%patch110 -p1 -b .rh507429 # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x @@ -664,6 +666,10 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-8.P1 +- active query might be destroyed in resume_dslookup() which triggered REQUIRE + failure (#507429) + * Mon Mar 22 2010 Adam Tkac <atkac redhat com> 32:9.7.0-7.P1 - install SDB related manpages only when build with SDB diff --git a/bind97-rh507429.patch b/bind97-rh507429.patch new file mode 100644 index 0000000..30e5169 --- /dev/null +++ b/bind97-rh507429.patch @@ -0,0 +1,33 @@ +diff -up bind-9.7.0-P1/lib/dns/resolver.c.rh507429 bind-9.7.0-P1/lib/dns/resolver.c +--- bind-9.7.0-P1/lib/dns/resolver.c.rh507429 2010-03-26 14:53:12.776469537 +0100 ++++ bind-9.7.0-P1/lib/dns/resolver.c 2010-03-26 15:07:18.363969402 +0100 +@@ -6160,6 +6160,7 @@ resume_dslookup(isc_task_t *task, isc_ev + if (fevent->result == ISC_R_CANCELED) { + dns_resolver_destroyfetch(&fctx->nsfetch); + fctx_done(fctx, ISC_R_CANCELED, __LINE__); ++ goto cleanup; + } else if (fevent->result == ISC_R_SUCCESS) { + + FCTXTRACE("resuming DS lookup"); +@@ -6219,15 +6220,16 @@ resume_dslookup(isc_task_t *task, isc_ev + resume_dslookup, fctx, + &fctx->nsrrset, NULL, + &fctx->nsfetch); +- if (result != ISC_R_SUCCESS) ++ if (result != ISC_R_SUCCESS) { + fctx_done(fctx, result, __LINE__); +- else { +- LOCK(&res->buckets[bucketnum].lock); +- locked = ISC_TRUE; +- fctx->references++; ++ goto cleanup; + } + } + ++ LOCK(&res->buckets[bucketnum].lock); ++ locked = ISC_TRUE; ++ fctx->references++; ++ + cleanup: + if (dns_rdataset_isassociated(&nameservers)) + dns_rdataset_disassociate(&nameservers); |