pool/avahi
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 41594 from home:lnussel:branches:GNOME:Factory

Browse Source 
Copy from home:lnussel:branches:GNOME:Factory/avahi via accept of submit request 41594 revision 2.
Request was accepted with message:
Reviewed ok (except we'd prefer seeing the patch name in the .changes file too... I will adjust that).

OBS-URL: https://build.opensuse.org/request/show/41594
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2010-06-18 08:20:40 +00:00 committed by Git OBS Bridge
parent 67fe2ea2c3
commit 58d15126b5
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
avahi-0.6.25-fixcrash.diff Normal file
View File

@ -0,0 +1,30 @@
From ae19b3039335999e3c06f2bec9ae11ee79b204c1 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 19 May 2010 15:43:44 +0200
Subject: [PATCH] ignore packet if FIONREAD returns zero
zero size is reported for corrupt packets. recvmsg() later could
nevertheless get data from a good packet that followed the bad one.
So get out early to avoid hitting an assertion.
---
avahi-core/socket.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 4146d5a..8b9736a 100644
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -805,6 +805,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
goto fail;
}
+ /* corrupt packets have zero size */
+ if (!ms)
+ goto fail;
+
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
--
1.6.4.2

5
avahi.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de
- avoid crash due to assertion when receiving corrupt packets
-------------------------------------------------------------------
Sat May 1 01:54:24 UTC 2010 - aj@suse.de

3
avahi.spec
View File

@ -70,6 +70,8 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch
#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.diff lnussel@suse.de -- mailed maintainer
Patch4: avahi-0.6.25-fixcrash.diff
#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-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
@ -646,6 +648,7 @@ translation-update-upstream
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%patch10 -p1
%patch11 -p1
%if !%build_core