Merge ~michal-maloszewski99/ubuntu/+source/dovecot:jammy-dovecot-fix into ubuntu/+source/dovecot:ubuntu/jammy-devel

[Michał Małoszewski]

Unmerged commits

86848ae... by Michał Małoszewski on 2022-10-20

changelog (LP: #1992848)

739107c... by Michał Małoszewski on 2022-10-20

Fix the dovecot package

Fix leaking mailboxes if virtual mailbox cannot be opened.
(LP: #1992848)

diff --git a/debian/changelog b/debian/changelog
index b02548e..7221207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dovecot (1:2.3.16+dfsg1-3ubuntu2.2) jammy; urgency=medium
+
+  * d/p/jammy-fix-leaking-mailboxes.patch: Fix leaking mailboxes if
+    virtual mailbox can not be opened (LP: #1992848)
+
+ -- Michal Maloszewski <[e-mail]>  Thu, 20 Oct 2022 23:36:54 +0200
+
 dovecot (1:2.3.16+dfsg1-3ubuntu2.1) jammy-security; urgency=medium
 
   * SECURITY UPDATE: privilege escalation via multiple passdbs
diff --git a/debian/patches/jammy-fix-leaking-mailboxes.patch b/debian/patches/jammy-fix-leaking-mailboxes.patch
new file mode 100644
index 0000000..bb7979e
--- /dev/null
+++ b/debian/patches/jammy-fix-leaking-mailboxes.patch
@@ -0,0 +1,37 @@
+From bdf4474ed82aaf964e7d94e72ca56b496e3815f9 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <[e-mail]>
+Date: Fri, 1 Oct 2021 15:08:45 +0300
+Subject: [PATCH] virtual: Fix leaking mailboxes if virtual mailbox can't
+ be opened
+
+Fixes also a crash at deinit:
+Panic: file mail-user.c: line 232 (mail_user_deinit): assertion failed: ((*user)->refcount == 1)
+
+Description: Fix the dovecot package to prevent from leaking mailboxes
+ if virtual mailbox cannot be opened.
+Origin: upstream, https://github.com/dovecot/core/commit/bdf4474ed82aaf964e7d94e72ca56b496e3815f9
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dovecot/+bug/1992848
+Last-Update: 2022-10-20
+---
+ src/plugins/virtual/virtual-storage.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
+index 2f31503d53..a0779cc186 100644
+--- a/src/plugins/virtual/virtual-storage.c
++++ b/src/plugins/virtual/virtual-storage.c
+@@ -495,12 +495,12 @@ static int virtual_mailbox_open(struct mailbox *box)
+ 		ret = virtual_mailboxes_open(mbox, box->flags);
+ 		array_pop_back(&mbox->storage->open_stack);
+ 	}
++	if (ret == 0)
++		ret = index_storage_mailbox_open(box, FALSE);
+ 	if (ret < 0) {
+ 		virtual_mailbox_close_internal(mbox);
+ 		return -1;
+ 	}
+-	if (index_storage_mailbox_open(box, FALSE) < 0)
+-		return -1;
+ 
+ 	mbox->virtual_ext_id =
+ 		mail_index_ext_register(mbox->box.index, "virtual", 0,
diff --git a/debian/patches/series b/debian/patches/series
index 6839beb..b8f8ff6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ mail-cache-bigendian-1.patch
 # Ubuntu patches
 OpenSSL3.patch
 CVE-2022-30550.patch
+jammy-fix-leaking-mailboxes.patch