From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 944BE13A77; Tue, 9 Mar 2021 17:18:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 980A013A6D; Tue, 9 Mar 2021 17:18:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id BA58D13A55; Tue, 9 Mar 2021 17:18:27 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 9C71413A54 for ; Tue, 9 Mar 2021 17:18:25 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E599A5C01D2 for ; Tue, 9 Mar 2021 12:18:24 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 09 Mar 2021 12:18:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=AziY/xEZ+69AIafAW5UTdZsPk3 G3o/jAQu71uYBXf9I=; b=kqJB+DbZd5mm0Q/Ch5LKU0Es4hShtyIkxr2F7wMbnX 7KkQEdK9rtp1lsguV1W1CaYmZVin+7F9azP95SWWo8kUUhDXx3rqouRhsCVFVw6w 4X33xk6wRjozOvVugBYJnpVjfqBk9ZLfh8ONLJzDP2j171fAaG9Zxt2+aezykrTY YEMAkoPoVmCKk6ajwlyfiqMiM/sgUPRWpJYFbRXbYz+tMCGgpXfd3ZRYI5Q2O+ki rMxnMPKmq5KmbDKCnCywKK6OoSCN0jqtlnQZ4VCqFhYKulgHyRdukAw2o4UPAf2d rGPVgxOP+rzpAvZFnkaI9ianCMst2LMKrGg0PpJgEyMg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=AziY/xEZ+69AIafAW 5UTdZsPk3G3o/jAQu71uYBXf9I=; b=aW2x0vrzrIJexi8fFK/Z5fgnDq7vWuywS lqc9ccX+1BAYK10lN3ShD9gGKmqjgSY4zubYULQg8IMbb88V95UYJ9/xaizj29i6 3ldmpY/AG/+Jwy7VgFRs10q+nEYsaXcSIRnCClIA3EJe8ZyJXfQ4G4YYC0Ejot0z CL1M/0h0aIds48OEWbzED+3GGdsYyQ93/8nphJ5dTtRERtAomC+x6vtcMCSZ9HiJ SjlxX3Kw6Z6CE9u8vXxzpUf5xEh0nhMOlXMUlFnNfKfGYS1iXo59/rdfBkVD9MAl s4W3TxPtcYKEca8Z1w2tKynuYermxjCBK0xpll28K9M8I5xLzUExg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudduiedgleelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecukfhppeejledrvdefhedruddvvddrudegheenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvd dtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p4feb7a91.dip0.t-ipconnect.de [79.235.122.145]) by mail.messagingengine.com (Postfix) with ESMTPA id 6424024005E for ; Tue, 9 Mar 2021 12:18:24 -0500 (EST) Received: by x220.qyliss.net (Postfix, from userid 1000) id 0F1B211C4; Tue, 9 Mar 2021 17:18:22 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success Date: Tue, 9 Mar 2021 17:18:16 +0000 Message-Id: <20210309171816.8589-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3M26KSVKGIDAHXH35RDDRNVMPS5NKFMO X-Message-ID-Hash: 3M26KSVKGIDAHXH35RDDRNVMPS5NKFMO X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Previously, this returned the return value of connect(2), which is 0 on success. So stdin would be assigned to descriptors 6 and 7 in vsockclient instead of the socket. Oops. --- vsock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vsock.c b/vsock.c index 3bcd8b3..d9ff3b6 100644 --- a/vsock.c +++ b/vsock.c @@ -55,7 +55,10 @@ int vsock_open(uint32_t cid, uint32_t port) if (fd =3D=3D -1) return -1; =20 - return vsock_connect(fd, cid, port); + if (vsock_connect(fd, cid, port) =3D=3D -1) + return -1; + + return fd; } =20 int vsock_get_port(int fd, uint32_t *port) --=20 2.30.0