From nobody Fri Mar 27 04:52:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1771446588; cv=none; d=zohomail.com; s=zohoarc; b=YIc29T985GougHV1B6vPVBIgizOCLIBVuYWH84lel/wn0gZoy6Zwo3L7QKbJQGjNKKQBC+G5Yy3AmYh9QvzAG1iyCdbIbIL781O/XElktU9Xdok7eA5Qw3w7w2FsL1UoCH1hGKLq4WaopKT1bIQPtepx6kND3Uzk61cJFoBKVhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771446588; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zkwUUASolEhVxvg1YgpDo8GiYqPwUnrSrAAlmje9B6M=; b=ZBuf8pKGRzoKSMSwY1832v/5PAt3RRBShCjoqNVJ2gqT6EzNGBdD9l+NA7xi5JsI2pTkHyGvOfXxVqW6jzfq2u313s/6sVQ0/UMPqH8ubEvaPdGoNI3LnXpTASW4/VEOH5VJiDIn7cXjEGZP7+EkJm2vt2ZZtk0Mlw6OECdvUWE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771446588829387.07040280242325; Wed, 18 Feb 2026 12:29:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsoAU-0007E2-0J; Wed, 18 Feb 2026 15:29:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsoA4-00074Z-3B for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:40 -0500 Received: from forwardcorp1a.mail.yandex.net ([178.154.239.72]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsoA1-0007s2-Ub for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:39 -0500 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:3530:0:640:eca4:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id AFAD3C038E; Wed, 18 Feb 2026 23:28:36 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:53d::1:1b]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id VShB144A8iE0-sDDid53j; Wed, 18 Feb 2026 23:28:36 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1771446516; bh=zkwUUASolEhVxvg1YgpDo8GiYqPwUnrSrAAlmje9B6M=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=dhPzQxh1YHd2OTyXJMr0kVnQgP9EDal5IpmpkymFU+7SwSiZVomwDmMU0SRi9EiVy PHYwmJFWbarXK3o0rY9nfFZzj/GcT2pcn5QfbGdyHYelSYxFl7mjALn6jiyMWrLnJ2 YeBqhReJO3+CG0f9Mt9bCEYWIeZWTNEpgY+tgM3w= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, bchaney@akamai.com, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, davydov-max@yandex-team.ru, vsementsov@yandex-team.ru Subject: [PATCH v3 05/12] net/tap: net_init_tap(): common fail label Date: Wed, 18 Feb 2026 23:28:21 +0300 Message-ID: <20260218202829.1322088-6-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260218202829.1322088-1-vsementsov@yandex-team.ru> References: <20260218202829.1322088-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.72; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1771446591513154100 Content-Type: text/plain; charset="utf-8" Add common failure label. This: - simplifies failure paths in the function - get rid of unusual free_fail: in the middle of the function - simplify further refactoring Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 84 ++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/net/tap.c b/net/tap.c index 331a779585..2eb8a2caeb 100644 --- a/net/tap.c +++ b/net/tap.c @@ -820,10 +820,12 @@ int net_init_tap(const Netdev *netdev, const char *na= me, NetClientState *peer, Error **errp) { const NetdevTapOptions *tap; - int fd, vnet_hdr =3D 0, i =3D 0, queues; + int fd =3D -1, vnet_hdr =3D 0, i =3D 0, queues; /* for the no-fd, no-helper case */ char ifname[128]; - int ret =3D 0; + char **fds =3D NULL, **vhost_fds =3D NULL; + int nfds =3D 0, nvhosts =3D 0; + =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); tap =3D &netdev->u.tap; @@ -867,31 +869,24 @@ int net_init_tap(const Netdev *netdev, const char *na= me, if (tap->fd) { fd =3D monitor_fd_param(monitor_cur(), tap->fd, errp); if (fd =3D=3D -1) { - return -1; + goto fail; } =20 if (!qemu_set_blocking(fd, false, errp)) { - close(fd); - return -1; + goto fail; } =20 vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { - close(fd); - return -1; + goto fail; } =20 if (!net_init_tap_one(tap, peer, "tap", name, NULL, NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp)) { - close(fd); - return -1; + goto fail; } } else if (tap->fds) { - char **fds; - char **vhost_fds; - int nfds =3D 0, nvhosts =3D 0; - fds =3D g_new0(char *, MAX_TAP_QUEUES); vhost_fds =3D g_new0(char *, MAX_TAP_QUEUES); =20 @@ -901,77 +896,58 @@ int net_init_tap(const Netdev *netdev, const char *na= me, if (nfds !=3D nvhosts) { error_setg(errp, "The number of fds passed does not match " "the number of vhostfds passed"); - ret =3D -1; - goto free_fail; + goto fail; } } =20 for (i =3D 0; i < nfds; i++) { fd =3D monitor_fd_param(monitor_cur(), fds[i], errp); if (fd =3D=3D -1) { - ret =3D -1; - goto free_fail; + goto fail; } =20 if (!qemu_set_blocking(fd, false, errp)) { - ret =3D -1; - goto free_fail; + goto fail; } =20 if (i =3D=3D 0) { vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { - ret =3D -1; - goto free_fail; + goto fail; } } else if (vnet_hdr !=3D tap_probe_vnet_hdr(fd, NULL)) { error_setg(errp, "vnet_hdr not consistent across given tap fds"); - ret =3D -1; - goto free_fail; + goto fail; } =20 if (!net_init_tap_one(tap, peer, "tap", name, ifname, NULL, NULL, tap->vhostfds ? vhost_fds[i] : NULL, vnet_hdr, fd, errp)) { - ret =3D -1; - goto free_fail; + goto fail; } } - -free_fail: - for (i =3D 0; i < nvhosts; i++) { - g_free(vhost_fds[i]); - } - for (i =3D 0; i < nfds; i++) { - g_free(fds[i]); - } - g_free(fds); - g_free(vhost_fds); - return ret; } else if (tap->helper) { fd =3D net_bridge_run_helper(tap->helper, tap->br ?: DEFAULT_BRIDGE_INTERFACE, errp); if (fd =3D=3D -1) { - return -1; + goto fail; } =20 if (!qemu_set_blocking(fd, false, errp)) { - return -1; + goto fail; } vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { - close(fd); - return -1; + goto fail; } =20 if (!net_init_tap_one(tap, peer, "bridge", name, ifname, NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp)) { - close(fd); - return -1; + goto fail; } } else { g_autofree char *script =3D @@ -989,14 +965,13 @@ free_fail: fd =3D net_tap_init(tap, &vnet_hdr, i >=3D 1 ? NULL : script, ifname, sizeof ifname, queues > 1, errp); if (fd =3D=3D -1) { - return -1; + goto fail; } =20 if (queues > 1 && i =3D=3D 0 && !tap->ifname) { if (tap_fd_get_ifname(fd, ifname)) { error_setg(errp, "Fail to get ifname"); - close(fd); - return -1; + goto fail; } } =20 @@ -1004,13 +979,28 @@ free_fail: i >=3D 1 ? NULL : script, i >=3D 1 ? NULL : downscript, tap->vhostfd, vnet_hdr, fd, errp)) { - close(fd); - return -1; + goto fail; } } } =20 return 0; + +fail: + close(fd); + if (vhost_fds) { + for (i =3D 0; i < nvhosts; i++) { + g_free(vhost_fds[i]); + } + g_free(vhost_fds); + } + if (fds) { + for (i =3D 0; i < nfds; i++) { + g_free(fds[i]); + } + g_free(fds); + } + return -1; } =20 int tap_enable(NetClientState *nc) --=20 2.52.0