From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 2E96C5A0271 for ; Wed, 16 Nov 2022 05:42:26 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NBr4R4NVDz4xyQ; Wed, 16 Nov 2022 15:42:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1668573735; bh=5U6p6Bhr+xztCPQvPVoC57n92r4g4n1b0uFtho+zmcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y6eP2axEk84LYH0+olo/rMaC4ddr4TICkUColDhs1QfA7jX3AQDSeHOvE93rb9mKX OFsCSeqDl0QGh0RM91WjAjU5twJK/lL17NEqtAYWiNEiVUJaQgg6fHnjlcWcwyJsNf S1YKzZpYJfCg/ive8BzfRjeuotb5knLcE7dSIADo= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 31/32] util: Always return -1 on error in sock_l4() Date: Wed, 16 Nov 2022 15:42:11 +1100 Message-Id: <20221116044212.3876516-32-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116044212.3876516-1-david@gibson.dropbear.id.au> References: <20221116044212.3876516-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6IMLP55KUYC45PKPAJLA6U577GVR6NDV X-Message-ID-Hash: 6IMLP55KUYC45PKPAJLA6U577GVR6NDV X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: According to its doc comments, sock_l4() returns -1 on error. It does, except in one case where it returns -EIO. Fix this inconsistency to match the docs and always return -1. Signed-off-by: David Gibson --- util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util.c b/util.c index fc629ed..e2222b8 100644 --- a/util.c +++ b/util.c @@ -141,7 +141,7 @@ int sock_l4(const struct ctx *c, int af, uint8_t proto, if (fd > SOCKET_MAX) { close(fd); - return -EIO; + return -1; } ref.r.s = fd; -- 2.38.1