From patchwork Fri Jul 11 10:18:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 369104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E2DF914003E for ; Fri, 11 Jul 2014 20:19:01 +1000 (EST) Received: from localhost ([::1]:43798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5Xut-0007hA-Tx for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 06:18:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5XuU-0007Oc-D1 for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5XuN-0008O3-Cv for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:18:34 -0400 Received: from toccata.ens-lyon.fr ([140.77.166.68]:37154 helo=toccata.ens-lyon.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5XuN-0008M7-6C for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:18:27 -0400 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 8E308840A2 for ; Fri, 11 Jul 2014 12:18:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4UG9CKj6vfcR for ; Fri, 11 Jul 2014 12:18:25 +0200 (CEST) Received: from type.ipv6 (unknown [151.216.26.125]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 58744840A1 for ; Fri, 11 Jul 2014 12:18:25 +0200 (CEST) Received: from samy by type.ipv6 with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1X5XuK-0008Gu-Rb for qemu-devel@nongnu.org; Fri, 11 Jul 2014 12:18:24 +0200 Date: Fri, 11 Jul 2014 12:18:24 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Message-ID: <20140711101824.GM4837@type> References: <1384700688-30377-1-git-send-email-samuel.thibault@ens-lyon.org> <1392124097-10618-1-git-send-email-samuel.thibault@ens-lyon.org> <1392124097-10618-2-git-send-email-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1392124097-10618-2-git-send-email-samuel.thibault@ens-lyon.org> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 140.77.166.68 Subject: [Qemu-devel] [PATCH] slirp: goto bad in udp_input if sosendto fails X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Before this patch, if sosendto fails, udp_input is executed as if the packet was sent, recording the packet for icmp errors, which does not makes sense since the packet was not actually sent, errors would be related to a previous packet. This patch adds a goto bad to cut the execution of this function. Signed-off-by: Guillaume Subiron --- slirp/udp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/slirp/udp.c b/slirp/udp.c index 8cc6cb6..fd2446a 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -218,6 +218,7 @@ udp_input(register struct mbuf *m, int iphlen) *ip=save_ip; DEBUG_MISC((dfd,"udp tx errno = %d-%s\n",errno,strerror(errno))); icmp_error(m, ICMP_UNREACH,ICMP_UNREACH_NET, 0,strerror(errno)); + goto bad; } m_free(so->so_m); /* used for ICMP if error on sorecvfrom */