summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2010-01-13 09:56:41 +0000
committerAdam Tkac <atkac@fedoraproject.org>2010-01-13 09:56:41 +0000
commit55f8c03f04a7b857df6de59a90535dca83b05b41 (patch)
tree7e2dd6f8d33fbf9e739f77a4f67938db411dc84f
parenta353fce6264be56fbc98e08912614b1e4ab702cf (diff)
downloadbind-55f8c03f04a7b857df6de59a90535dca83b05b41.tar.gz
bind-55f8c03f04a7b857df6de59a90535dca83b05b41.tar.xz
bind-55f8c03f04a7b857df6de59a90535dca83b05b41.zip
- fix occasional crash in keytable.c (#554316)bind-9_6_1-14_P2_fc12
-rw-r--r--bind.spec7
-rw-r--r--bind96-rh554316.patch19
2 files changed, 25 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index d9bcd42..1fe684c 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.6.1
-Release: 13.%{PATCHVER}%{?dist}
+Release: 14.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,7 @@ Patch101:bind-96-old-api.patch
Patch102:bind-95-rh452060.patch
Patch106:bind93-rh490837.patch
Patch107:bind96-rh507469.patch
+Patch108:bind96-rh554316.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -217,6 +218,7 @@ mkdir m4
%patch102 -p1 -b .rh452060
%patch106 -p0 -b .rh490837
%patch107 -p1 -b .rh507469
+%patch108 -p1 -b .rh554316
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -583,6 +585,9 @@ rm -rf ${RPM_BUILD_ROOT}
%ghost %{chroot_prefix}/etc/localtime
%changelog
+* Wed Jan 13 2010 Adam Tkac <atkac redhat com> 32:9.6.1-14.P2
+- fix occasional crash in keytable.c (#554316)
+
* Wed Nov 25 2009 Adam Tkac <atkac redhat com> 32:9.6.1-13.P2
- update to 9.6.1-P2 (CVE-2009-4022)
diff --git a/bind96-rh554316.patch b/bind96-rh554316.patch
new file mode 100644
index 0000000..aef18f7
--- /dev/null
+++ b/bind96-rh554316.patch
@@ -0,0 +1,19 @@
+--- bind-9.6.1-P2/lib/dns/validator.c.rh549284 2010-01-11 11:40:26.480893127 +0100
++++ bind-9.6.1-P2/lib/dns/validator.c 2010-01-11 11:40:57.730892953 +0100
+@@ -2161,7 +2161,7 @@ validatezonekey(dns_validator_t *val) {
+ result == ISC_R_SUCCESS;
+ result = dns_rdataset_next(val->event->sigrdataset))
+ {
+- dns_keynode_t *keynode = NULL, *nextnode = NULL;
++ dns_keynode_t *keynode = NULL;
+
+ dns_rdata_reset(&sigrdata);
+ dns_rdataset_current(val->event->sigrdataset,
+@@ -2181,6 +2181,7 @@ validatezonekey(dns_validator_t *val) {
+ result == ISC_R_SUCCESS)
+ atsep = ISC_TRUE;
+ while (result == ISC_R_SUCCESS) {
++ dns_keynode_t *nextnode = NULL;
+ dstkey = dns_keynode_key(keynode);
+ result = verify(val, dstkey, &sigrdata,
+ sig.keyid);