rpms/bind/F-11 bind97-rh507429.patch,NONE,1.1 bind.spec,1.328,1.329

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv957

Modified Files:
	bind.spec 
Added Files:
	bind97-rh507429.patch 
Log Message:
- active query might be destroyed in resume_dslookup() which triggered REQUIRE
  failure (#507429)


bind97-rh507429.patch:
 resolver.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE bind97-rh507429.patch ---
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);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- bind.spec	19 Mar 2010 11:07:23 -0000	1.328
+++ bind.spec	26 Mar 2010 14:48:49 -0000	1.329
@@ -19,7 +19,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.2
-Release:  2.%{PATCHVER}%{?dist}
+Release:  3.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +53,7 @@ Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch108:bind96-rh549284.patch
+Patch109:bind97-rh507429.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -217,6 +218,7 @@ mkdir m4
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch108 -p1 -b .rh549284
+%patch109 -p1 -b .rh507429
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -584,6 +586,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.6.2-3.P1
+- active query might be destroyed in resume_dslookup() which triggered REQUIRE
+  failure (#507429)
+
 * Fri Mar 19 2010 Adam Tkac <atkac redhat com> 32:9.6.2-2.P1
 - update to 9.6.2-P1 upstream release (#556366)