From nobody Sat Apr 27 09:36:23 2024 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641401508; cv=none; d=zohomail.com; s=zohoarc; b=JGmxrrNrE4NlXu0c3VUPsi+mhtq4zYdwTU+U5N5J+CRnq3Jqrv7HwFg8B9F6tQoTqaSHSXVK5be6ktB7imsj28Sc1ugrNVW/sbJZMPhqir5DdBR7TR5RaFdUVym4vUXEszcLKqFTEPFtvuayu8w2gLy6ImFieh8pLORCCWvVYk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641401508; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VuBzE8dIuy1MwqUjC3TAArH5pVL/fBClNJZpGS4Jo1M=; b=I7+IR7+YSvwZzc0anT4R/q5uyNy8sS93H+BqUHZawkILIitafIqvb7i9qKPyBB0A/8MpaujRD8oLj7U6NBpcE8NKv+OGdPfS3YPhBDSGlg+advmo1NHrfqaSQhQNCoj84r+ewlpqXaGnr8BPy4is2w2jUZhCLEi7rarZTSKPwKk= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641401508274364.49857749503974; Wed, 5 Jan 2022 08:51:48 -0800 (PST) Received: from localhost ([::1]:40158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n59Vq-00042M-NX for importer@patchew.org; Wed, 05 Jan 2022 11:51:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3asrVYQcKCmseNWcdaNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--venture.bounces.google.com>) id 1n59Uo-0003Kg-5k for qemu-devel@nongnu.org; Wed, 05 Jan 2022 11:50:42 -0500 Received: from [2607:f8b0:4864:20::b4a] (port=45630 helo=mail-yb1-xb4a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3asrVYQcKCmseNWcdaNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--venture.bounces.google.com>) id 1n59Um-0005rk-PJ for qemu-devel@nongnu.org; Wed, 05 Jan 2022 11:50:41 -0500 Received: by mail-yb1-xb4a.google.com with SMTP id c132-20020a251c8a000000b0060c39ab7d36so54628539ybc.12 for ; Wed, 05 Jan 2022 08:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=VuBzE8dIuy1MwqUjC3TAArH5pVL/fBClNJZpGS4Jo1M=; b=AdEoPLmIuK6S3CksQdhqpdcUcF4y0+BTtrvyKtD+nzjFPZMHkRLY2HyOplTfojJ3lP 9vl+M6zKad9mdKf59PvzFL94pecTzH+z5Rak/1AC+pnZHDzrcMfUQmuX4iEGtDZzpYlF 4Ee2E/ZR+Syon4LlHwoZ3UCT7OjYX80oYsRKBP+3gvNtPCU8nLJksxqLx4NyeSKFX1Ai Noc+wM/l2bHam3OZj/kOlYBzteBIvlH1QRFNj05iTJm8P8xjSOylJMkQW7t5O22/4wYe +CdUPugh4j0fn5hdaCwRlBx6Q/q8H9AQEMw2GuNeQgGpSJqjrzkcgQn0K4/8mWpWVf52 ilLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=VuBzE8dIuy1MwqUjC3TAArH5pVL/fBClNJZpGS4Jo1M=; b=Nz6RJqqozuCsaBSQDSoHXdMQIIaqySDH3o/c2AJ/S7kMchbqx2HSWbQZDG8ki6gqQo 1jM+/7YM7yaVjf5XrU34/BegoOZtS19+FEdrgETssCHfr28p2pByXtVuYIqY501dVvKu OjQFViyqo2gOX/1cpTe+iGFTAg/rId4yrKOqg2eankNGOaSUzib1SlJLobWyFUY+ORH8 /XvMYajeO64yidXV7x3eU03vLNF1rKv0lNEBOTi3SQUgK+oxiQgIPl9kecXBeCDqyY19 Chup/jrUqRqA1nxL+BtxP0DW4GxD1DkX+Cv7phD/QoplsLDuCh7zFBNob+E7yTAwVwBM tDJA== X-Gm-Message-State: AOAM5334wHATlnQrfvS0+8N8e4xHv3NW25i3eyDZgSoTPczLiFEqrr3h d019XfBRXS/jIGElafUikeZgHfGEBxIr X-Google-Smtp-Source: ABdhPJxwQMgDdoK6Z/GFdIns9VNIhlSrGMS5FXRwXsJ3lRSBHxH0kZXuVptODUKQ6gcE/L38PPgkJevtpd7V X-Received: from venture.svl.corp.google.com ([2620:15c:2a3:200:9017:ad23:15fc:8efc]) (user=venture job=sendgmr) by 2002:a25:bb07:: with SMTP id z7mr32198883ybg.509.1641400938394; Wed, 05 Jan 2022 08:42:18 -0800 (PST) Date: Wed, 5 Jan 2022 08:42:14 -0800 Message-Id: <20220105164214.3381151-1-venture@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v2] net/tap: Set return code on failure From: Patrick Venture To: f4bug@amsat.org, jasowang@redhat.com, pefoley@google.com Cc: qemu-devel@nongnu.org, Patrick Venture Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::b4a (failed) 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=2607:f8b0:4864:20::b4a; envelope-from=3asrVYQcKCmseNWcdaNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--venture.bounces.google.com; helo=mail-yb1-xb4a.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641401509238100001 Content-Type: text/plain; charset="utf-8" From: Peter Foley Match the other error handling in this function. Fixes: e7b347d0bf6 ("net: detect errors from probing vnet hdr flag for TAP = devices") Reviewed-by: Patrick Venture Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Foley Reviewed-by: Stefano Garzarella --- v2: Fixed commit titlewq and updated description. --- net/tap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tap.c b/net/tap.c index f716be3e3f..c5cbeaa7a2 100644 --- a/net/tap.c +++ b/net/tap.c @@ -900,6 +900,7 @@ int net_init_tap(const Netdev *netdev, const char *name, if (i =3D=3D 0) { vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { + ret =3D -1; goto free_fail; } } else if (vnet_hdr !=3D tap_probe_vnet_hdr(fd, NULL)) { --=20 2.34.1.448.ga2b2bfdf31-goog