commit avahi for openSUSE:11.4

Hello community, here is the log from the commit of package avahi for openSUSE:11.4 checked in at Fri Feb 18 14:00:33 CET 2011. -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- old-versions/11.4/all/avahi/avahi.changes 2011-02-13 17:24:49.000000000 +0100 +++ /mounts/work_src_done/11.4/avahi/avahi.changes 2011-02-17 16:42:48.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 17 15:38:40 CET 2011 - vuntz@opensuse.org + +- Add avahi-null-packet-infinite-loop.patch: fix an infinite loop + eating CPU when receiving corrupted/null packets. Fix bnc#671797. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- avahi-null-packet-infinite-loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.C3m2MY/_old 2011-02-18 14:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.C3m2MY/_new 2011-02-18 14:00:20.000000000 +0100 @@ -31,7 +31,7 @@ %define build_qt3 0 %define build_qt4 0 Version: 0.6.28 -Release: 3 +Release: 4.<RELEASE2> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -74,6 +74,8 @@ Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch11: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -647,6 +649,7 @@ %patch4 -p1 %patch5 -p1 %patch10 -p1 +%patch11 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. avahi-mono.spec: same change ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.C3m2MY/_old 2011-02-18 14:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.C3m2MY/_new 2011-02-18 14:00:20.000000000 +0100 @@ -31,7 +31,7 @@ %define build_qt3 0 %define build_qt4 1 Version: 0.6.28 -Release: 3 +Release: 4.<RELEASE2> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -74,6 +74,8 @@ Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch11: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -649,6 +651,7 @@ %patch4 -p1 %patch5 -p1 %patch10 -p1 +%patch11 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.C3m2MY/_old 2011-02-18 14:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.C3m2MY/_new 2011-02-18 14:00:20.000000000 +0100 @@ -33,7 +33,7 @@ %define build_qt3 0 %define build_qt4 0 Version: 0.6.28 -Release: 3 +Release: 7.<RELEASE2> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -76,6 +76,8 @@ Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch11: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -649,6 +651,7 @@ %patch4 -p1 %patch5 -p1 %patch10 -p1 +%patch11 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi-null-packet-infinite-loop.patch ++++++ commit 10e10a37d13c6c9b8d58a509460ceeaeb59023f0 Author: Vincent Untz Date: Thu Feb 17 15:36:37 2011 +0100 socket: Still read corrupt packets from the sockets Else, we end up with an infinite loop with 100% CPU. http://www.avahi.org/ticket/325 diff --git a/avahi-core/socket.c b/avahi-core/socket.c index be62105..e4438eb 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -653,10 +653,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( goto fail; } - /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */ - if (!ms) - goto fail; - p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -683,6 +679,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( goto fail; } + /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So + * fail after having read them. */ + if (!ms) + goto fail; + if (sa.sin_addr.s_addr == INADDR_ANY) { /* Linux 2.4 behaves very strangely sometimes! */ goto fail; @@ -810,10 +811,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( goto fail; } - /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */ - if (!ms) - goto fail; - p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -841,6 +838,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( goto fail; } + /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So + * fail after having read them. */ + if (!ms) + goto fail; + assert(!(msg.msg_flags & MSG_CTRUNC)); assert(!(msg.msg_flags & MSG_TRUNC)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org