Merge ~lucaskanashiro/ubuntu/+source/openldap:ubuntu/bionic/fix-slapd-seg-fault-1838370 into ubuntu/+source/openldap:ubuntu/bionic-devel

[Lucas Kanashiro]

The upstream patch to fix slapd crash reported in [1] was applied. It fixes the rwm overlay module which was freeing some memory when it was still needed, causing segmentation faults. More info about it in d/p/rwm-do-not-free-original-filter.patch and in the bug report itself [1], including how to test it. There is also a PPA for testing purpose available [2].

[1] https://bugs.launchpad.net/ubuntu/+source/openldap/+bug/1838370
[2] https://launchpad.net/~lucaskanashiro/+archive/ubuntu/bionic-openldap-slapd-segfault-1838370/

[Christian Ehrhardt  (paelzer)]

Discussed in the disco MP [1] +1 under the condition that the test steps will be refined to work reliable (they didn't for me)

[1]: https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/openldap/+git/openldap/+merge/371147

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Everything is fine as you can see in the other MP [1]. Thanks for the approval, please upload it.

[1]: https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/openldap/+git/openldap/+merge/371147

[Christian Ehrhardt  (paelzer)]

tagged and sponsored to -unapproved

diff --git a/debian/changelog b/debian/changelog
index 79e3456..2a6bf4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openldap (2.4.45+dfsg-1ubuntu1.4) bionic; urgency=medium
+
+  * d/p/rwm-do-not-free-original-filter.patch: Fix slapd segfault (LP: #1838370)
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 08 Aug 2019 15:08:36 -0300
+
 openldap (2.4.45+dfsg-1ubuntu1.3) bionic-security; urgency=medium
 
   * SECURITY UPDATE: rootDN proxyauthz not restricted to its own databases
diff --git a/debian/patches/rwm-do-not-free-original-filter.patch b/debian/patches/rwm-do-not-free-original-filter.patch
new file mode 100644
index 0000000..ea02ec3
--- /dev/null
+++ b/debian/patches/rwm-do-not-free-original-filter.patch
@@ -0,0 +1,41 @@
+From d40b357f5da9a94d2f4f541c21bde02610d9cd3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <[e-mail]>
+Date: Mon, 17 Jun 2019 12:49:25 +0200
+Subject: [PATCH] ITS#8964 Do not free original filter
+
+---
+ servers/slapd/overlays/rwm.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+Origin: upstream, http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff;h=d40b357f5da9a94d2f4f541c21bde02610d9cd3b
+Bug: https://openldap.org/its/?findid=8964
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openldap/+bug/1838370
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=934277
+
+diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
+index 0f1b00d793..d863a23910 100644
+--- a/servers/slapd/overlays/rwm.c
++++ b/servers/slapd/overlays/rwm.c
+@@ -125,11 +125,15 @@ rwm_op_rollback( Operation *op, SlapReply *rs, rwm_op_state *ros )
+ 		break;
+ 	case LDAP_REQ_SEARCH:
+ 		op->o_tmpfree( ros->mapped_attrs, op->o_tmpmemctx );
+-		filter_free_x( op, op->ors_filter, 1 );
+-		op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
+ 		op->ors_attrs = ros->ors_attrs;
+-		op->ors_filter = ros->ors_filter;
+-		op->ors_filterstr = ros->ors_filterstr;
++		if ( op->ors_filter != ros->ors_filter ) {
++			filter_free_x( op, op->ors_filter, 1 );
++			op->ors_filter = ros->ors_filter;
++		}
++		if ( op->ors_filterstr.bv_val != ros->ors_filterstr.bv_val ) {
++			op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
++			op->ors_filterstr = ros->ors_filterstr;
++		}
+ 		break;
+ 	case LDAP_REQ_EXTENDED:
+ 		if ( op->ore_reqdata != ros->ore_reqdata ) {
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 45024f7..30b7d63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ CVE-2019-13057-2.patch
 CVE-2019-13057-3.patch
 CVE-2019-13057-4.patch
 CVE-2019-13565.patch
+rwm-do-not-free-original-filter.patch