[Pkg-openldap-devel] [openldap] 03/03: cherry-pick fix for CVE-2013-4449 (#729367)

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch wheezy
in repository openldap.

commit b15cc88293cee5f822e80f3d594389ef91419838
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Apr 7 19:39:56 2014 -0700

    cherry-pick fix for CVE-2013-4449 (#729367)
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
---
 debian/changelog                                   |  3 ++
 .../patches/ITS7723-fix-reference-counting.patch   | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 085369c..3dba6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ openldap (2.4.31-2) UNRELEASED; urgency=high
   * debian/patches/ITS8027-deref-reject-empty-attr-list.patch: Import upstream 
     patch to fix a crash when a search includes the Deref control with an 
     empty attribute list. (ITS#8027) (Closes: #776988)
+  * debian/patches/ITS7723-fix-reference-counting.patch: Import upstream patch 
+    to fix a crash in the rwm overlay when a search is immediately followed by 
+    an unbind. (ITS#7723) (CVE-2013-4449) (Closes: #729367)
 
  -- Luca Bruno <lucab at debian.org>  Thu, 05 Feb 2015 12:40:58 +0100
 
diff --git a/debian/patches/ITS7723-fix-reference-counting.patch b/debian/patches/ITS7723-fix-reference-counting.patch
new file mode 100644
index 0000000..54a65ed
--- /dev/null
+++ b/debian/patches/ITS7723-fix-reference-counting.patch
@@ -0,0 +1,46 @@
+Description: fix remote DoS (CVE-2013-4449)
+ taken from RHEL (and Fedora)
+ for detail, see https://bugzilla.redhat.com/show_bug.cgi?id=1019490#c0
+
+ and upstream: http://www.openldap.org/its/index.cgi/Incoming?id=7723
+
+Author: Jan Synacek <jsynacek at redhat.com>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/729367
+Forwarded: not-need
+Last-Update: 2013-11-13
+
+
+
+From 742d3e4a6a1f62c3c3ae1e9341f3615b4705a701 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek at redhat.com>
+Date: Wed, 13 Nov 2013 09:06:54 +0100
+Subject: [PATCH] ITS#7723 fix reference counting
+
+---
+ libraries/librewrite/session.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
+index 28f2551..7c59d14 100644
+--- a/libraries/librewrite/session.c
++++ b/libraries/librewrite/session.c
+@@ -161,6 +161,7 @@ rewrite_session_find(
+ #ifdef USE_REWRITE_LDAP_PVT_THREADS
+ 	if ( session ) {
+ 		ldap_pvt_thread_mutex_lock( &session->ls_mutex );
++		session->ls_count++;
+ 	}
+ 	ldap_pvt_thread_rdwr_runlock( &info->li_cookies_mutex );
+ #endif /* USE_REWRITE_LDAP_PVT_THREADS */
+@@ -178,6 +179,7 @@ rewrite_session_return(
+ )
+ {
+ 	assert( session != NULL );
++	session->ls_count--;
+ 	ldap_pvt_thread_mutex_unlock( &session->ls_mutex );
+ }
+ 
+-- 
+1.8.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e7b7915..1b4caf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ no-bdb-ABI-second-guessing
 heimdal-fix
 bdb-deadlock.patch
 ITS8027-deref-reject-empty-attr-list.patch
+ITS7723-fix-reference-counting.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git