rpms/dovecot
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix ostream infinite loop (#1029906)

Browse Source
This commit is contained in:
Michal Hlavinka 2013-11-14 17:29:06 +01:00
parent 7a3fe1431f
commit 3ecaa4f55d
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dovecot-2.2.7-10c0aae82d0d.patch Normal file
View File

@ -0,0 +1,24 @@
# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1383514035 -7200
# Node ID 10c0aae82d0dee0b0107c2262db50d5f6984c181
# Parent 653d5a81a22e73ff91264f7e7277b1c0206574ec
ostream: Mark stream closed before handling its callback to avoid infinite loops.
The callback could call o_stream_copy_error_from_parent(), which in turn
would try to close the same ostream again.
diff -r 653d5a81a22e -r 10c0aae82d0d src/lib/ostream.c
--- a/src/lib/ostream.c Sun Nov 03 22:04:53 2013 +0200
+++ b/src/lib/ostream.c Sun Nov 03 23:27:15 2013 +0200
@@ -46,8 +46,8 @@
static void o_stream_close_full(struct ostream *stream, bool close_parents)
{
if (!stream->closed) {
+ stream->closed = TRUE;
io_stream_close(&stream->real_stream->iostream, close_parents);
- stream->closed = TRUE;
}
if (stream->stream_errno == 0)

7
dovecot.spec
View File

@ -5,7 +5,7 @@ Name: dovecot
Epoch: 1 Epoch: 1
Version: 2.2.7 Version: 2.2.7
%global prever %{nil} %global prever %{nil}
Release: 1%{?dist} Release: 2%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2 License: MIT and LGPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
@ -35,6 +35,7 @@ Patch5: dovecot-2.1-privatetmp.patch
#wait for network #wait for network
Patch6: dovecot-2.1.10-waitonline.patch Patch6: dovecot-2.1.10-waitonline.patch
Patch7: dovecot-2.2.7-10c0aae82d0d.patch
Source15: prestartscript Source15: prestartscript
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -131,6 +132,7 @@ This package provides the development files for dovecot.
%patch4 -p1 -b .reload %patch4 -p1 -b .reload
%patch5 -p1 -b .privatetmp %patch5 -p1 -b .privatetmp
%patch6 -p1 -b .waitonline %patch6 -p1 -b .waitonline
%patch7 -p1 -b .10c0aae82d0d
sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
%build %build
@ -484,6 +486,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so %{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog %changelog
* Thu Nov 14 2013 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.7-2
- fix ostream infinite loop (#1029906)
* Mon Nov 04 2013 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.7-1 * Mon Nov 04 2013 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.7-1
- dovecot updated to 2.2.7 - dovecot updated to 2.2.7
- master process was doing a hostname.domain lookup for each created - master process was doing a hostname.domain lookup for each created