Merge ~bryce/ubuntu/+source/dovecot:sru-lp1992848-jammy into ubuntu/+source/dovecot:ubuntu/jammy-devel

[Bryce Harrington]

I've rebased Michal's patch-on-a-plate SRU for dovecot. Unfortunately, we lack steps to reproduce the bug and the affected users haven't responded to the latest batch of questions. But as long as they show up to test, no reason not to give the SRU a shot. The fix looks straightforward and obvious. My only changes vs. Michal's is to change the patch name and commit message.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/dovecot-sru-lp1992848

The PPA is still building. I don't plan to run autopkgtests against the PPA but feel free to do so as part of the review if you'd like; I don't expect any problems.

[Andreas Hasenack (ahasenack)]

Looking at this

[Andreas Hasenack (ahasenack)]

Nothing to comment further, +1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks, uploaded to jammy:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/dovecot
Vcs-Git-Commit: b76ea5c1e4659a2ed58032d340218738cc37764e
Vcs-Git-Ref: refs/heads/sru-lp1992848-jammy
$ dput ubuntu ../dovecot_2.3.16+dfsg1-3ubuntu2.3_source.changes
gpg: ../dovecot_2.3.16+dfsg1-3ubuntu2.3_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../dovecot_2.3.16+dfsg1-3ubuntu2.3.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dovecot_2.3.16+dfsg1-3ubuntu2.3.dsc: done.
  Uploading dovecot_2.3.16+dfsg1-3ubuntu2.3.debian.tar.xz: done.
  Uploading dovecot_2.3.16+dfsg1-3ubuntu2.3_source.buildinfo: done.
  Uploading dovecot_2.3.16+dfsg1-3ubuntu2.3_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 181b344..bd13b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dovecot (1:2.3.16+dfsg1-3ubuntu2.3) jammy; urgency=medium
+
+  * d/p/fix-leaking-virtual-mailbox.patch: Fix leak/crash when failing to
+    open virtual mailboxes.
+    (LP: #1992848)
+
+ -- Michal Maloszewski <[e-mail]>  Thu, 20 Oct 2022 23:36:54 +0200
+
 dovecot (1:2.3.16+dfsg1-3ubuntu2.2) jammy; urgency=medium
 
   * Backport fix + refactoring for handling ssl settings
diff --git a/debian/patches/fix-leaking-virtual-mailbox.patch b/debian/patches/fix-leaking-virtual-mailbox.patch
new file mode 100644
index 0000000..01cf4d4
--- /dev/null
+++ b/debian/patches/fix-leaking-virtual-mailbox.patch
@@ -0,0 +1,38 @@
+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
+Reviewed-By: Bryce Harrington <[e-mail]>
+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 03caf8e..7899a3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ split-off-master_service_ssl_server_settings.patch
 remove-unused-master_service_is_ssl_module_loaded.patch
 use-ssl-server-settings-only-when-necessary.patch
 remove-unnecessary-master_service_flag_use_ssl_settings.patch
+fix-leaking-virtual-mailbox.patch