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 2E24C15258; Wed, 10 Mar 2021 20:50:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 87B9A151B9; Wed, 10 Mar 2021 20:50:14 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 9DB0115222; Wed, 10 Mar 2021 20:50:12 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2096.outbound.protection.outlook.com [40.92.18.96]) by atuin.qyliss.net (Postfix) with ESMTPS id 1009D15221 for ; Wed, 10 Mar 2021 20:50:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hAccT9Apo4xjzWYyFb7KU5qoM4Wbfo3DHBUbRoFUhiktS384d9bkUVPqBH6hmJFfb5fKsejfwLS0jd8SOU4ZLviAMMxjuq2F10TryPonFdFSNdfpFOi6uXULUSr/eWl328ewQxfdhW4lGDJrmdFBXAk1sdG2/w9iZbZkSTnaW4opQD4Y7Lx2lCBDMmMAhas3Kuip1mAlundSJ3j+mp8sFqB5flOqYcibFhHFmq1UhcSDDUq6tI7O1BH92sXbtfhZHllNeVaqM80cZtmjVO22MTpZSyKasgGIwM99bh+rIPPmUhFugZ6bWRf8y2BRpdwiXy2QTOjbqSCYiyDXNgFEqA== 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=n1aE9iOjijajkZgFfNpSU6cKnP6q7/7J9Ru83LcOoUM=; b=cVpYrCOqMgHWAVeK1E09dgYD+MNgL4oUKOLCZMVr4pU0kIv0Cmp78OcGFBHARm5ksZ7w160z3D3wKQbHrBsjdC75JpKy0YdLIi36z5BStUhAz0fhKY3d6BhaNObFPlKsA9xJh4A2FMAbNfetJ5sKAeFAmCUJnUhah5VJVAwpUNRRc1JhlpSIG4p5eNxXauZrCksjTnotq8W4inXQz8WxDiqj+hYrU7QeaCR8nPJH8sUUtA5AfM6NdeIfU4U3j/aSEcofmtnuN0IFsBY+2wS/W8fKiCkb615B+vqjmCqtNbhqxF1iFr2LOcGW9QMBqE/UQSd6kwjH59834X9QTK6+dA== 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=n1aE9iOjijajkZgFfNpSU6cKnP6q7/7J9Ru83LcOoUM=; b=Z7PsQQxZmgpwxVX91spyuN+A3aWGpKY6jl2U8e96wlzgU2ItObPFK8euzgX/iQrt9cH8iVPlWWEhuocNtyxG/axkhYYPEuZAq4yfzgm4MVSL1HF1pm3kyhMaV3xQaD7PzF8jDj/KB4avbORl535xUM5518fnFWVIvx5yrThUSlcdluY1ErORuA3VWVagBhhTVVr5jw5KmVe8FMBNjsYBH7q8zudykgxPwhvUeAwrD20XfOdgTcF21VjU0VOcSypX8WvoT1N2GgFB4N6J1+mQLzLUmsF7Jh70IjmZcRYsOJ+AHJ7GqfTcGytiH/QByxcyEX4A+L1XwPCJ4RstyG4rbw== Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::4f) by BN8NAM11HT138.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::108) 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 20:50:06 +0000 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com (2a01:111:e400:fc4b::42) by BN8NAM11FT068.mail.protection.outlook.com (2a01:111:e400:fc4b::325) 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 20:50:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:72BCA82FC3DE322510A0563971A9C7C217EDA8BE9C2FAA9726929A6BCECC26F5;UpperCasedChecksum:976B60EF30F419E096666038E87CA3BFB0FFA0CDA34123BD0C8C2688D67769D3;SizeAsReceived:8520;Count:45 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 20:50:05 +0000 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Subject: Re: [PATCH ucspi-vsock] vsock_accept: return fd instead of 0 on success From: "Cole Helbling" To: "Alyssa Ross" , Date: Wed, 10 Mar 2021 12:48:03 -0800 Message-ID: In-Reply-To: <20210310204516.20041-1-hi@alyssa.is> X-TMN: [3x1r9a+3Ycdt6/5HHK9Z40t3n+S3Zb17] X-ClientProxiedBy: SJ0PR05CA0064.namprd05.prod.outlook.com (2603:10b6:a03:332::9) 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 SJ0PR05CA0064.namprd05.prod.outlook.com (2603:10b6:a03:332::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.16 via Frontend Transport; Wed, 10 Mar 2021 20:50:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3d238cbe-7608-41ea-88ca-08d8e406157b X-MS-Exchange-SLBlob-MailProps: Xo9mRxKQURRRPIFOL/wYFmlQDfC/7C6r7RXnKelIwOhYLFMFpiSAAvteZuPJJODHsv09YwyJ+egnh3iQm5Z1e1geeN4DuExK2krZiNeu6aJRCYhq1cKzARzp54qqp3XEyma8btohVHn7OFgnT9e4X5+mSl3G3D6XEKCmjGi9PhBDHz5wy4WnNP4QqWKuDuDwQv7LCCRJXPXtg1yVicjI0skIAjsazmsE481mvMFAddkab/yx1GvpPMj+dRRd2mgf8D5BIA2dyts7dhkJzr/4N3O60Xep6yKJgOVbVUopKLKdKqjOdBHt2FQMFnNtzNLKZJaAlWyVEn19ICCInC4+QNsTjZhpjbl+/eyHP1K1w2LtcUxAsfeHQbftz0UgvfDpyGmgfsQ8+Td8q2YFbCwQRhkyxbGvT1whmOY6BEL9Bgv01XZGbntFEnAhDPQXmEnBy1uCr2aCA3cBY0nEIJ3AvEB393GtY0ev1qXcKmdS23Hcihr8FfmXsfv6l3J9pfSMT4qwU++0Nj9F7O4dvqoOigAGhMg/JslWlRroTjAtOn8TeBXKw0CYbf1Yj1T5MIxZ5YJ0AHYSXp0yZeWK5Qwu0vWDNatUl2uDgCbxY+F9aXgWEaYKDn66fo8SjopSxMmPa0fXRut8WVoXaBTR8Xw3zsEB2OOuEEJ4S0TOfuS7zzwM6LBDHw7/WoHZb/LVAQLZUAim5nxEJW6GnLAwVO8RAJMe/XwiKqD8DPJVZfkG+XFcvc9akSh2EarQO/sbaATB28hM2cS6Nl5xeOatuPn6LUXnHOCvqsgzB7KW1MECSr6vGMnImTAva/U5i5eJOVdKc7o2cDWimCnZIIzneXd73Iwbnx+VR53HIM7f/IsJrOs6kxoiiQmVNRLXa+DCxo+3AYgng4yZHSj/udEUh11zIAFpaDeMgHMRH4u4NWTIXgIlGvgdRfHBaw== X-MS-TrafficTypeDiagnostic: BN8NAM11HT138: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yHFhTpwaiG+hVPFpgcMTWFWmEW41rY9hhxH3T3UweOzrQyBZYzx3Ddwcb7W+D9CwzuONSExQQ7Euurp8Asv19m9OFQxzZD76ZoDI1pP32T4VZU13raYCpuIKkhA3b/Ute/X3ZSyApL99pDH6fAax0zFcO0pN0zmp2EGYO2GOGaafsQzyI+oE8myDTvrWyjyVmJ8Y9BC3CXrQjyMG7DFkoXeUj758zFYlgRiNOHz6HBIK3lLYCI0wmg9ieqrHhm/w2zal8LGXesskgKbx/lKrqtbcApn5v2wgpisZLnflobdo3j07viBu+/ZrL1w0Dl/ajW7RiYEykWr7erOOPksmJ1BjEbXnM+He7fdBc9wP9MI86AgsNFZ2aK8Fj+TlGCeQeTrIVNaJDsP/sDAwQ9In9BSzS2kqZGB2VjJvhaeAbvI= X-MS-Exchange-AntiSpam-MessageData: /Z5RvbUd5sJhsy2j1jgY5r05HDLgCXRpa9F0kmMF5mnHW01KXZrPnZq4PtRJcTYvo5lxJEUESWvkPHVkzSjIIPzacfTjXfX0vCrdPEgIMPLdkXasa1POTw3DDqNYMPUyLIGRYbNIJttRdNpRcoNqFA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d238cbe-7608-41ea-88ca-08d8e406157b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2021 20:50:05.8391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT068.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: BN8NAM11HT138 Message-ID-Hash: F2MYLX3DHYFAH73T2S64SGWSOZF6JP66 X-Message-ID-Hash: F2MYLX3DHYFAH73T2S64SGWSOZF6JP66 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 CC: Cole Helbling 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 Wed Mar 10, 2021 at 12:45 PM PST, Alyssa Ross wrote: > This would result in the spawned process being hooked up to stdin, > instead of the vsock. Then stdin would be closed, so subsequent > processes would be connected to nothing. Oops. > > --- > I am... a bit embarassed that I didn't notice this after already > fixing the exact same problem in vsock_connect[1]. Technically, you _did_ notice this after fixing the the problem in vsock_connect -- just not immediately / at the same time ;) > Maybe I can write an integration test that runs vsockserver and > vsockclient and checks they actually do the right thing... > > [1]: > https://spectrum-os.org/lists/archives/spectrum-devel/20210309171816.8589= -1-hi@alyssa.is/raw > > vsock.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/vsock.c b/vsock.c > index d9ff3b6..e6a173c 100644 > --- a/vsock.c > +++ b/vsock.c > @@ -32,14 +32,15 @@ int vsock_accept(int sockfd, uint32_t *cid, uint32_t > *port) > { > struct sockaddr_vm addr =3D { 0 }; > socklen_t addr_size =3D sizeof addr; > + int fd; > =20 > - if (accept(sockfd, (struct sockaddr *)&addr, &addr_size) =3D=3D -1) > + if ((fd =3D accept(sockfd, (struct sockaddr *)&addr, &addr_size)) =3D= =3D -1) > return -1; > =20 > *cid =3D addr.svm_cid; > *port =3D addr.svm_port; > =20 > - return 0; > + return fd; > } > =20 > int vsock_connect(int fd, uint32_t cid, uint32_t port) > -- > 2.30.0 Reviewed-by: Cole Helbling