Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hello,
Could you please unblock package evolution-data-server
The latest upload fixes different crashes:
* d/p/03_Use-after-free-gpg-verif.patch: Fix crash during GPG signature
verification (Closes: #772802)
* d/p/04_sqlite-Track-pending-sync-requests.patch: Properly track pending
sync requests before closing the sqlite files (Closes: #775701)
The 2 patches are coming from upstream.
Cheers,
Laurent Bigonville
unblock evolution-data-server/3.12.9~git20141128.5242b0-2+deb8u1
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.18.0-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_BE.utf8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru evolution-data-server-3.12.9~git20141128.5242b0/debian/changelog evolution-data-server-3.12.9~git20141128.5242b0/debian/changelog
--- evolution-data-server-3.12.9~git20141128.5242b0/debian/changelog 2014-11-30 23:59:54.000000000 +0100
+++ evolution-data-server-3.12.9~git20141128.5242b0/debian/changelog 2015-01-30 00:57:21.000000000 +0100
@@ -1,3 +1,12 @@
+evolution-data-server (3.12.9~git20141128.5242b0-2+deb8u1) unstable; urgency=medium
+
+ * d/p/03_Use-after-free-gpg-verif.patch: Fix crash during GPG signature
+ verification (Closes: #772802)
+ * d/p/04_sqlite-Track-pending-sync-requests.patch: Properly track pending
+ sync requests before closing the sqlite files (Closes: #775701)
+
+ -- Laurent Bigonville <bi...@debian.org> Fri, 30 Jan 2015 00:57:19 +0100
+
evolution-data-server (3.12.9~git20141128.5242b0-2) unstable; urgency=medium
* Fix brown paper bug in libcamel1.2-dev dependencies.
diff -Nru evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/03_Use-after-free-gpg-verif.patch evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/03_Use-after-free-gpg-verif.patch
--- evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/03_Use-after-free-gpg-verif.patch 1970-01-01 01:00:00.000000000 +0100
+++ evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/03_Use-after-free-gpg-verif.patch 2015-01-29 23:49:10.000000000 +0100
@@ -0,0 +1,21 @@
+From e46c53c21291f7844c72ce964f1eaaa0397abbe2 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mc...@redhat.com>
+Date: Fri, 12 Dec 2014 14:11:04 +0100
+Subject: Bug 741434 - Use-after-free after error in GPG signature verification
+
+
+diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
+index 742e943..0b694a7 100644
+--- a/camel/camel-gpg-context.c
++++ b/camel/camel-gpg-context.c
+@@ -1888,6 +1888,7 @@ gpg_verify_sync (CamelCipherContext *context,
+
+ g_object_unref (filter);
+ g_object_unref (istream);
++ istream = NULL;
+
+ g_seekable_seek (G_SEEKABLE (canon_stream), 0, G_SEEK_SET, NULL, NULL);
+
+--
+cgit v0.10.1
+
diff -Nru evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/04_sqlite-Track-pending-sync-requests.patch evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/04_sqlite-Track-pending-sync-requests.patch
--- evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/04_sqlite-Track-pending-sync-requests.patch 1970-01-01 01:00:00.000000000 +0100
+++ evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/04_sqlite-Track-pending-sync-requests.patch 2015-01-30 00:03:29.000000000 +0100
@@ -0,0 +1,178 @@
+From a1bc3301e7e2d5ad810370f048c209d45f709017 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mc...@redhat.com>
+Date: Fri, 5 Dec 2014 12:22:05 +0100
+Subject: [SQLite VFS] Track pending sync requests
+
+The sync request are done asynchronously, in a dedicated thread,
+which means that the database file can be closed meanwhile. The
+database has no reference counting, thus it's required to track
+whether there are any pending sync requests, to not free the
+structure too early.
+
+diff --git a/camel/camel-db.c b/camel/camel-db.c
+index fb0e581..0106741 100644
+--- a/camel/camel-db.c
++++ b/camel/camel-db.c
+@@ -53,6 +53,12 @@ typedef struct {
+ GRecMutex sync_mutex;
+ guint timeout_id;
+ gint flags;
++
++ /* Do know how many syncs are pending, to not close
++ the file before the last sync is over */
++ guint pending_syncs;
++ GMutex pending_syncs_lock;
++ GCond pending_syncs_cond;
+ } CamelSqlite3File;
+
+ static gint
+@@ -91,6 +97,13 @@ sync_request_thread_cb (gpointer task_data,
+
+ call_old_file_Sync (sync_data->cFile, sync_data->flags);
+
++ g_mutex_lock (&sync_data->cFile->pending_syncs_lock);
++ g_warn_if_fail (sync_data->cFile->pending_syncs > 0);
++ sync_data->cFile->pending_syncs--;
++ if (!sync_data->cFile->pending_syncs)
++ g_cond_signal (&sync_data->cFile->pending_syncs_cond);
++ g_mutex_unlock (&sync_data->cFile->pending_syncs_lock);
++
+ done = sync_data->done;
+ g_free (sync_data);
+
+@@ -136,6 +149,10 @@ sync_push_request (CamelSqlite3File *cFile,
+
+ cFile->flags = 0;
+
++ g_mutex_lock (&cFile->pending_syncs_lock);
++ cFile->pending_syncs++;
++ g_mutex_unlock (&cFile->pending_syncs_lock);
++
+ g_rec_mutex_unlock (&cFile->sync_mutex);
+
+ g_thread_pool_push (sync_pool, data, &error);
+@@ -269,6 +286,12 @@ camel_sqlite3_file_xClose (sqlite3_file *pFile)
+ /* Make the last sync. */
+ sync_push_request (cFile, TRUE);
+
++ g_mutex_lock (&cFile->pending_syncs_lock);
++ while (cFile->pending_syncs > 0) {
++ g_cond_wait (&cFile->pending_syncs_cond, &cFile->pending_syncs_lock);
++ }
++ g_mutex_unlock (&cFile->pending_syncs_lock);
++
+ if (cFile->old_vfs_file->pMethods)
+ res = cFile->old_vfs_file->pMethods->xClose (cFile->old_vfs_file);
+ else
+@@ -278,6 +301,8 @@ camel_sqlite3_file_xClose (sqlite3_file *pFile)
+ cFile->old_vfs_file = NULL;
+
+ g_rec_mutex_clear (&cFile->sync_mutex);
++ g_mutex_clear (&cFile->pending_syncs_lock);
++ g_cond_clear (&cFile->pending_syncs_cond);
+
+ return res;
+ }
+@@ -340,6 +365,10 @@ camel_sqlite3_vfs_xOpen (sqlite3_vfs *pVfs,
+ }
+
+ g_rec_mutex_init (&cFile->sync_mutex);
++ g_mutex_init (&cFile->pending_syncs_lock);
++ g_cond_init (&cFile->pending_syncs_cond);
++
++ cFile->pending_syncs = 0;
+
+ g_rec_mutex_lock (&only_once_lock);
+
+diff --git a/libebackend/e-sqlite3-vfs.c b/libebackend/e-sqlite3-vfs.c
+index cf49682..264b734 100644
+--- a/libebackend/e-sqlite3-vfs.c
++++ b/libebackend/e-sqlite3-vfs.c
+@@ -40,6 +40,12 @@ typedef struct {
+ GRecMutex sync_mutex;
+ guint timeout_id;
+ gint flags;
++
++ /* Do know how many syncs are pending, to not close
++ the file before the last sync is over */
++ guint pending_syncs;
++ GMutex pending_syncs_lock;
++ GCond pending_syncs_cond;
+ } ESqlite3File;
+
+ static gint
+@@ -72,6 +78,13 @@ sync_request_thread_cb (gpointer task_data,
+
+ call_old_file_Sync (sync_data->cFile, sync_data->flags);
+
++ g_mutex_lock (&sync_data->cFile->pending_syncs_lock);
++ g_warn_if_fail (sync_data->cFile->pending_syncs > 0);
++ sync_data->cFile->pending_syncs--;
++ if (!sync_data->cFile->pending_syncs)
++ g_cond_signal (&sync_data->cFile->pending_syncs_cond);
++ g_mutex_unlock (&sync_data->cFile->pending_syncs_lock);
++
+ sync_op = sync_data->sync_op;
+ g_free (sync_data);
+
+@@ -92,6 +105,13 @@ sync_push_request (ESqlite3File *cFile,
+
+ g_rec_mutex_lock (&cFile->sync_mutex);
+
++ if (!cFile->flags) {
++ /* nothing to sync, might be when xClose is called
++ without any pending xSync request */
++ g_rec_mutex_unlock (&cFile->sync_mutex);
++ return;
++ }
++
+ if (wait_for_finish)
+ sync_op = e_flag_new ();
+
+@@ -102,6 +122,10 @@ sync_push_request (ESqlite3File *cFile,
+
+ cFile->flags = 0;
+
++ g_mutex_lock (&cFile->pending_syncs_lock);
++ cFile->pending_syncs++;
++ g_mutex_unlock (&cFile->pending_syncs_lock);
++
+ g_rec_mutex_unlock (&cFile->sync_mutex);
+
+ g_thread_pool_push (sync_pool, data, &error);
+@@ -227,6 +251,12 @@ e_sqlite3_file_xClose (sqlite3_file *pFile)
+ /* Make the last sync. */
+ sync_push_request (cFile, TRUE);
+
++ g_mutex_lock (&cFile->pending_syncs_lock);
++ while (cFile->pending_syncs > 0) {
++ g_cond_wait (&cFile->pending_syncs_cond, &cFile->pending_syncs_lock);
++ }
++ g_mutex_unlock (&cFile->pending_syncs_lock);
++
+ if (cFile->old_vfs_file->pMethods)
+ res = cFile->old_vfs_file->pMethods->xClose (cFile->old_vfs_file);
+ else
+@@ -236,6 +266,8 @@ e_sqlite3_file_xClose (sqlite3_file *pFile)
+ cFile->old_vfs_file = NULL;
+
+ g_rec_mutex_clear (&cFile->sync_mutex);
++ g_mutex_clear (&cFile->pending_syncs_lock);
++ g_cond_clear (&cFile->pending_syncs_cond);
+
+ return res;
+ }
+@@ -294,6 +326,10 @@ e_sqlite3_vfs_xOpen (sqlite3_vfs *pVfs,
+ }
+
+ g_rec_mutex_init (&cFile->sync_mutex);
++ g_mutex_init (&cFile->pending_syncs_lock);
++ g_cond_init (&cFile->pending_syncs_cond);
++
++ cFile->pending_syncs = 0;
+
+ g_rec_mutex_lock (&only_once_lock);
+
+--
+cgit v0.10.1
+
diff -Nru evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/series evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/series
--- evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/series 2014-09-15 11:06:33.000000000 +0200
+++ evolution-data-server-3.12.9~git20141128.5242b0/debian/patches/series 2015-01-30 00:09:42.000000000 +0100
@@ -1 +1,3 @@
02_Only-export-symbols-starting-with-e.patch
+03_Use-after-free-gpg-verif.patch
+04_sqlite-Track-pending-sync-requests.patch
