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=-2.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 09B5614DF9; Wed, 10 Mar 2021 17:49:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id CA2F714D7B; Wed, 10 Mar 2021 17:49:17 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 83F1214DD7; Wed, 10 Mar 2021 17:49:15 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2037.outbound.protection.outlook.com [40.92.19.37]) by atuin.qyliss.net (Postfix) with ESMTPS id D1C5F14DD6 for ; Wed, 10 Mar 2021 17:49:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XP/4ZxR5PVcvsEYEupGTJqb1onDw7l8XOnGjyTpQeIe3bPeILK57OoVnhR+a/9uCEw+Pg46ecr4KeWnehpRXGVLQEG8rWz2I/EsthEBSyrCboXQt0/K5A4s9A8/NKvqGyYCdbd/d4ASDFqhRH9z3ikPGoEhUNuR5uATLhsP7w+17+Yi50ZTKIGbRVtx6tqKvj+oMce3HYCJrGq3Fpqb+5DXROj05lKxwOBAUITJR0t+rSdKJWUE+i8UiSwDvia6BoXtMjnjzDxQroJpJGh4hUj2K2DgxFMVvqBeb73Ora0lCKD1nLX/uFQfQzCXRsE+VUJuluu4l9KjoLT0/IX1Wlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EOuRj3ieg2Jlu9VoBwxMvdFxF7EGGh74qULz48pLMgw=; b=B7biiaotRTOq0vCpg8DAiLFF0kC3KKaXD3f3sU4sAMGZ+ALDn//wF+Od3YoQIv3neR8+N0+BrKBPgOZd6D1oKNVBtblI/i/mK+l7vLpSuPFi8BLNlRe+Tmq/U+BctoIr6DG+4K0VNh952E/V/cppnrnSOhGN9jhgIkO/XjLX1uANVKjCHrqJbsugEpoOjMnDGCCjDw/mtc1qMe29bhpy3iO15Ip3QRbeekaZpPIeag4QQsuUEl7z60lfjPYEnJPdX07ru55in9yJmF3S6Cx2RCymxpPB9VMqw8JLJwxf31P3KXVI4X5aJ5W3O8g6e+XvKtgA7W0zMY6+Dg1bpkRpHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EOuRj3ieg2Jlu9VoBwxMvdFxF7EGGh74qULz48pLMgw=; b=kKk9hs9AlmkUpp5B6n0aYoCkPTVMbvYFteaCj8VcwYHHILLL5MyTLigzg+3NItJmhNT7MKClpYhbPr0Ww/sh73opZgNXyfFdULu65uP+ukmOktV4guuXydumuA/RGH6I2PdbghJKbzByjxx9Zx6RGEkmdKynccvdgqZ1bEZgKhYL9ZcilNR5eexhLChJdASyP08dEtk0YKHOJqSajNcBH2fRK8eB+u/YkwYlEuTN4UxNJZ73Yjj/u1mp4btqOIpL+RQtOv+WWf8QUovPKjcR+2Kj1NQx2rfPAYhtqmXklXXJniuWQ+PC8DhKo7gGS3Caqkh6Sxz0qmKtB2ZlJxA5qg== Received: from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::4d) by BN8NAM11HT187.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::369) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31; Wed, 10 Mar 2021 17:49:09 +0000 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com (2a01:111:e400:fc4b::4e) by BN8NAM11FT010.mail.protection.outlook.com (2a01:111:e400:fc4b::309) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31 via Frontend Transport; Wed, 10 Mar 2021 17:49:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B5DA980B4EBFD17510A3A5A21D9C62BF4463FE37F5D62F2B9B455534A3C29D47;UpperCasedChecksum:78CDBACAABEFCE27D6AFA82BB13F2FEB7812F4C1937BD0EE69FF4DFB92265EFE;SizeAsReceived:8459;Count:44 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::ed0b:679f:905f:4c94]) by SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::ed0b:679f:905f:4c94%4]) with mapi id 15.20.3912.030; Wed, 10 Mar 2021 17:49:09 +0000 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 To: "Alyssa Ross" , Subject: Re: [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success From: "Cole Helbling" Date: Wed, 10 Mar 2021 09:46:35 -0800 Message-ID: In-Reply-To: <20210309171816.8589-1-hi@alyssa.is> X-TMN: [uZobqy1/BHRkxztgF6xPsWe2jqf5wEDj] X-ClientProxiedBy: BYAPR05CA0067.namprd05.prod.outlook.com (2603:10b6:a03:74::44) To SJ0PR03MB5581.namprd03.prod.outlook.com (2603:10b6:a03:27b::20) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (73.48.197.220) by BYAPR05CA0067.namprd05.prod.outlook.com (2603:10b6:a03:74::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.23 via Frontend Transport; Wed, 10 Mar 2021 17:49:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c8dfef67-b65a-4a88-e59f-08d8e3ecceca X-MS-TrafficTypeDiagnostic: BN8NAM11HT187: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z0qjqWQJ5oIpin7Pl5rXpeZZgsiibB63aEazue1z4rSZGYmM1cNoALGzG7kyHzcZyOPgnQfcicALhaJGEkVgwmQIGW9lXFOZccbDTCh/OLY+gBZbAXFyl+NQZkwDqZsS9XjCzmkJsDDXRsma+R9yU9J3qYJOm4wuLRf39+nhll4pdY0YUAbcKXlYJ2UZk050AiPZvgLTDgZbPXw+3S9QLz2d0z/epbD6BkbsyHkoKA00sUa/JV3aoHZcYBjPMOcxB9antNnppS+qRXgx74LjlTyeMyuWWAlz8MvWdNWd7CedGHjDic/i4qnJgKQm55ms1oCsTVroHHKZ30vNknCrgrejZk6wf77vWHL5bLYN8+RlSUvHD461dqy/hgkGaIfLvPrnp/UM8C3q4Gr6lBqsYw== X-MS-Exchange-AntiSpam-MessageData: hlL/V5s+RdhKaz42Bw/ER4duZ0rOqqqSMwLV3Ym9N7l2C/GadF1i3tHtL8HJzFPCw+6q7Mh103I496OOnhmkVW3buf2FTl11HLfoycAKNR/LHFZv+uprG/gMrlhuiAUMCAe7hSrmin6RPlYVXLPNbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8dfef67-b65a-4a88-e59f-08d8e3ecceca X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2021 17:49:09.5599 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8NAM11HT187 Message-ID-Hash: VVV65NJTSOC2BO3WDLVPMUR55EEEPUWA X-Message-ID-Hash: VVV65NJTSOC2BO3WDLVPMUR55EEEPUWA X-MailFrom: cole.e.helbling@outlook.com 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: On Tue Mar 9, 2021 at 9:18 AM PST, Alyssa Ross wrote: > 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) > -- > 2.30.0 Hehe, oops indeed. (Still haven't fixed the indentation issue with aerc... Some day I'll get around to it...) Reviewed-by: Cole Helbling