From patchwork Tue Feb 11 13:08:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 319292 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 914232C0097 for ; Wed, 12 Feb 2014 00:58:35 +1100 (EST) Received: from localhost ([::1]:33488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDD7C-0001q5-2m for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 08:11:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDD4g-0006fQ-Mp for qemu-devel@nongnu.org; Tue, 11 Feb 2014 08:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDD4Z-0000xV-R0 for qemu-devel@nongnu.org; Tue, 11 Feb 2014 08:08:30 -0500 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:59251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDD4Z-0000x2-L0 for qemu-devel@nongnu.org; Tue, 11 Feb 2014 08:08:23 -0500 X-IronPort-AV: E=Sophos;i="4.95,825,1384297200"; d="scan'208";a="57870544" Received: from unknown (HELO type.ipv6) ([193.50.110.152]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 11 Feb 2014 14:08:21 +0100 Received: from samy by type.ipv6 with local (Exim 4.82) (envelope-from ) id 1WDD4X-0002mN-8U; Tue, 11 Feb 2014 14:08:21 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 14:08:02 +0100 Message-Id: <1392124097-10618-2-git-send-email-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392124097-10618-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1384700688-30377-1-git-send-email-samuel.thibault@ens-lyon.org> <1392124097-10618-1-git-send-email-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.83 Cc: Jan Kiszka , Samuel Thibault , Guillaume Subiron Subject: [Qemu-devel] [PATCH 01/16] 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 */