[pdns/el5] CVE-2012-0206

[Ruben Kerkhof]

commit ecaffc7bb8ceaf86906ee7aefe4b259237056635
Author: Ruben <ruben at rubenkerkhof.com>
Date:   Mon Jan 9 20:46:08 2012 +0100

    CVE-2012-0206

 pdns-cve-2012-0206.patch |   13 +++++++++++++
 pdns.spec                |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/pdns-cve-2012-0206.patch b/pdns-cve-2012-0206.patch
new file mode 100644
index 0000000..1769049
--- /dev/null
+++ b/pdns-cve-2012-0206.patch
@@ -0,0 +1,13 @@
+diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
+index 909ba4b..1fbfaf0 100644
+--- a/pdns/common_startup.cc
++++ b/pdns/common_startup.cc
+@@ -244,6 +244,8 @@ void *qthread(void *number)
+       numreceived4++;
+     else
+       numreceived6++;
++    if(P->d.qr)
++      continue;
+ 
+     S.ringAccount("queries", P->qdomain+"/"+P->qtype.getName());
+     S.ringAccount("remotes",P->getRemote());
diff --git a/pdns.spec b/pdns.spec
index 7f585ab..6ae7476 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -9,6 +9,7 @@ URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
+Patch1:		%{name}-cve-2012-0206.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -80,6 +81,7 @@ This package contains the SQLite backend for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .fixinit
+%patch1 -p1
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -179,6 +181,9 @@ fi
 
 
 %changelog
+* Mon Jan 09 2012 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-4
+- CVE-2012-0206
+
 * Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
 - Upstream released new version