From patchwork Sat Nov 10 14:09:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 150741 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1099015ljp; Sat, 10 Nov 2018 06:27:19 -0800 (PST) X-Google-Smtp-Source: AJdET5eLTNF7J6mazt4ED9KNWMQRhMF4HcAvvnZRCbfdFYlMxcBfITxra9yEBkNhTVP68cP6fmve X-Received: by 2002:ac8:3715:: with SMTP id o21mr9053527qtb.224.1541860039880; Sat, 10 Nov 2018 06:27:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541860039; cv=none; d=google.com; s=arc-20160816; b=J0HTgN+6Hm3CiXtMscSjJ0/ZPGyCj6Fwlp/1u4Gxj6TpbSgU50F/PTL9vNNdegDvRo f4fyLsu/S2kHV40swBkqsMbWJxOEKSf9NWxAIyDpeg6IMnHikFNR76suzryDUqGwo5rA rrr0xc26E1/RQPepOFKEZqZJq9NMR+WTqbLcH9W5X5mlSlR8Xy7KtOERBBa7/nQx1/Ij VnKh8dTuyfXtg88iPUMFBdeQj3cDRbJQZMmkQAc2oDBKpcXxydxTdeebTU5ezbqKQvm4 snxeDh8RBsPzTdCY+wg6B8SMp5DIHtrp/uBVfzbSCBAXjYEJk6MK2H1d4yOVPXcOVUMc jbVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=1FzX9raC+L2y2SP7W2zAAEUwaQ91MYO8uS4G120kWFA=; b=0aFmNzKqUTNCYCRpndpfZ5fyJOgr1lAyfuLqiaPB1kq/41sNL0GasDoPoqbT12jR08 ux3mYwqVC0pg/F0RKIL4erQRbtPV8D1jZnjVduaHfWzIb2cWiBOSmZn8hzUpowQIe3eg UY3kXYuOO8ZUjmTD5GWh6bEH3pCyABrAjqbeWilphrDncipSOtDgQnS+/Ifvl6PUPyFj H9MMxqbIYxwohLa3zrJ/zYPZkHceuYZbbBRWXVvTX1O96BM70j9Cs6X7RyskFBtWG6QE kUio++8SsgAuCeXDR3R9i+q7xkK08kp1YarM1CQ1VFQy4A4S8MUB+YKJqVyb21BisXlU M8Fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k34si4946939qtd.156.2018.11.10.06.27.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 10 Nov 2018 06:27:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:38667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLUEJ-0004cf-Ad for patch@linaro.org; Sat, 10 Nov 2018 09:27:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLU9B-0006rS-Ui for qemu-devel@nongnu.org; Sat, 10 Nov 2018 09:22:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLTxG-0000Qn-FP for qemu-devel@nongnu.org; Sat, 10 Nov 2018 09:09:45 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:44348) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gLTxG-0000F7-5s for qemu-devel@nongnu.org; Sat, 10 Nov 2018 09:09:42 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 2F2BC1218; Sat, 10 Nov 2018 15:09:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mqXSEfKLFVhQ; Sat, 10 Nov 2018 15:09:27 +0100 (CET) Received: from function (lfbn-bor-1-169-137.w90-50.abo.wanadoo.fr [90.50.25.137]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 901502EC2; Sat, 10 Nov 2018 15:09:26 +0100 (CET) Received: from samy by function with local (Exim 4.91) (envelope-from ) id 1gLTwz-0005r2-Oi; Sat, 10 Nov 2018 15:09:25 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 10 Nov 2018 15:09:23 +0100 Message-Id: <20181110140925.22457-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181110140925.22457-1-samuel.thibault@ens-lyon.org> References: <20181110140925.22457-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 2/4] slirp: Use g_new() to allocate sockets in socreate() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jan.kiszka@siemens.com, stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The slirp socreate() function can only fail if the attempt to malloc() the struct socket fails. Switch to using g_new() instead, which will allow us to remove the error-handling code from its callers. Signed-off-by: Peter Maydell Signed-off-by: Samuel Thibault --- slirp/socket.c | 14 ++++++-------- slirp/tcp_input.c | 4 ++-- slirp/tcp_subr.c | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) -- 2.19.1 diff --git a/slirp/socket.c b/slirp/socket.c index 322383a1f9..35a9a14565 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -46,17 +46,15 @@ struct socket *solookup(struct socket **last, struct socket *head, struct socket * socreate(Slirp *slirp) { - struct socket *so; + struct socket *so = g_new(struct socket, 1); - so = (struct socket *)malloc(sizeof(struct socket)); - if(so) { memset(so, 0, sizeof(struct socket)); so->so_state = SS_NOFDREF; so->s = -1; so->slirp = slirp; so->pollfds_idx = -1; - } - return(so); + + return so; } /* @@ -110,7 +108,7 @@ sofree(struct socket *so) if (so->so_tcpcb) { free(so->so_tcpcb); } - free(so); + g_free(so); } size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np) @@ -721,8 +719,8 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, /* Don't tcp_attach... we don't need so_snd nor so_rcv */ if ((so->so_tcpcb = tcp_newtcpcb(so)) == NULL) { - free(so); - return NULL; + g_free(so); + return NULL; } insque(so, &slirp->tcb); diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 07bcbdb2dd..4f79c95fdb 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -432,8 +432,8 @@ findso: if ((so = socreate(slirp)) == NULL) goto dropwithreset; if (tcp_attach(so) < 0) { - free(so); /* Not sofree (if it failed, it's not insqued) */ - goto dropwithreset; + g_free(so); /* Not sofree (if it failed, it's not insqued) */ + goto dropwithreset; } sbreserve(&so->so_snd, TCP_SNDSPACE); diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 8d0f94b75f..0270c89ae3 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -475,7 +475,7 @@ void tcp_connect(struct socket *inso) return; } if (tcp_attach(so) < 0) { - free(so); /* NOT sofree */ + g_free(so); /* NOT sofree */ return; } so->lhost = inso->lhost;