From patchwork Wed Jun 11 08:55:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 358531 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 585D11400B2 for ; Wed, 11 Jun 2014 18:56:31 +1000 (EST) Received: from localhost ([::1]:44360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WueKa-0002bm-OL for incoming@patchwork.ozlabs.org; Wed, 11 Jun 2014 04:56:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WueKA-0002A5-5u for qemu-devel@nongnu.org; Wed, 11 Jun 2014 04:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WueK3-0004bw-Vp for qemu-devel@nongnu.org; Wed, 11 Jun 2014 04:56:02 -0400 Received: from toccata.ens-lyon.fr ([140.77.166.68]:41306 helo=toccata.ens-lyon.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WueK3-0004bq-PN for qemu-devel@nongnu.org; Wed, 11 Jun 2014 04:55:55 -0400 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4FF57840BF; Wed, 11 Jun 2014 10:55:54 +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 TlEvn84RYVRw; Wed, 11 Jun 2014 10:55:54 +0200 (CEST) Received: from type.ipv6 (eduroam-220a.sophia.inria.fr [193.51.208.220]) (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 20C53840BD; Wed, 11 Jun 2014 10:55:54 +0200 (CEST) Received: from samy by type.ipv6 with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1WueK1-0004Xi-IG; Wed, 11 Jun 2014 10:55:53 +0200 Date: Wed, 11 Jun 2014 10:55:53 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Message-ID: <20140611085553.GO31888@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 Cc: Jan Kiszka , Guillaume Subiron , edgar.iglesias@gmail.com 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. This could cause memory leak. 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 */