From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E83E7C6FA8E for ; Thu, 2 Mar 2023 20:54:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXpvi-000193-7b; Thu, 02 Mar 2023 15:53:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXpvd-000187-Ou; Thu, 02 Mar 2023 15:53:29 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXpvZ-0005lR-QT; Thu, 02 Mar 2023 15:53:29 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 322KJln9022863; Thu, 2 Mar 2023 20:53:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=1kCyE9WQ+NQegbTNYXStyT2Y/1nWO+SteztXUpmtetk=; b=aaws5xmkTvV0wcI6/4yb+FYHQlVEO0Oy03WdZAw26xwwidFabtqRJV98VS1JXY+8pOZi nVXsrAKHvb0GaHwjoM/vW3DEj2rFczZCGalx428Ou0M3LX5F+cVtOq5X6+F2nxooHqK7 c6TRie8btozhUXefZIuacOQ3r2D/iLzLZXDJ5DH54MgaTZjsV2IY8qzow9lqQrcBU4JI nSJLcQrlMvc7sD6Nk1pSfKDHsBjQlnOVgH1S649pMOOSITYwPNJ5pU7SsUy4T8OkjFbJ smSEcNOMgO2VYsu7tiyjU26IniJfres51bTtEjMqzw+6sosrNapez/PGcnqnZvGM2Uav iQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3p32r50nu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Mar 2023 20:53:11 +0000 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 322KYbYR014808; Thu, 2 Mar 2023 20:53:10 GMT Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3p32r50nts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Mar 2023 20:53:10 +0000 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 322KLGeb005629; Thu, 2 Mar 2023 20:53:09 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([9.208.130.98]) by ppma04dal.us.ibm.com (PPS) with ESMTPS id 3nybexpn54-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Mar 2023 20:53:09 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 322Kr8wn64487704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 2 Mar 2023 20:53:08 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 586CD5805A; Thu, 2 Mar 2023 20:53:08 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F40F558051; Thu, 2 Mar 2023 20:53:06 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 2 Mar 2023 20:53:06 +0000 (GMT) Message-ID: Date: Thu, 2 Mar 2023 15:53:06 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH v3 14/16] win32: avoid mixing SOCKET and file descriptor space Content-Language: en-US To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: Samuel Thibault , Jason Wang , Paolo Bonzini , Michael Roth , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Kevin Wolf , qemu-block@nongnu.org, armbru@redhat.com, Peter Maydell , Stefan Hajnoczi , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Stefan Weil , Fam Zheng , Stefan Berger , Joel Stanley , Hanna Reitz References: <20230221124802.4103554-1-marcandre.lureau@redhat.com> <20230221124802.4103554-15-marcandre.lureau@redhat.com> From: Stefan Berger In-Reply-To: <20230221124802.4103554-15-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: bVLzWAY2ezVa5kBg30B1V5-z8Xuo2UsF X-Proofpoint-ORIG-GUID: hJI9T__asCfeDH7a4adJVR5axYfmsv8E X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-02_13,2023-03-02_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 impostorscore=0 adultscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303020177 Received-SPF: pass client-ip=148.163.158.5; envelope-from=stefanb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.092, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 2/21/23 07:47, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Until now, a win32 SOCKET handle is often cast to an int file > descriptor, as this is what other OS use for sockets. When necessary, > QEMU eventually queries whether it's a socket with the help of > fd_is_socket(). However, there is no guarantee of conflict between the > fd and SOCKET space. Such conflict would have surprising consequences, > we shouldn't mix them. > > Also, it is often forgotten that SOCKET must be closed with > closesocket(), and not close(). > > Instead, let's make the win32 socket wrapper functions return and take a > file descriptor, and let util/ wrappers do the fd/SOCKET conversion as > necessary. A bit of adaptation is necessary in io/ as well. > > Unfortunately, we can't drop closesocket() usage, despite > _open_osfhandle() documentation claiming transfer of ownership, testing > shows bad behaviour if you forget to call closesocket(). > > Signed-off-by: Marc-André Lureau > --- > include/sysemu/os-win32.h | 4 +- > io/channel-watch.c | 6 +- > util/aio-win32.c | 9 +- > util/oslib-win32.c | 219 ++++++++++++++++++++++++++++++++------ > 4 files changed, 197 insertions(+), 41 deletions(-) > #undef connect > @@ -308,7 +315,13 @@ int qemu_connect_wrap(int sockfd, const struct sockaddr *addr, > socklen_t addrlen) > { > int ret; > - ret = connect(sockfd, addr, addrlen); > + SOCKET s = _get_osfhandle(sockfd); > + > + if (s == INVALID_SOCKET) { > + return -1; > + } > + > + ret = connect(s, addr, addrlen); Previously you passed int sockfd and now you convert this sockfd to a SOCKET s and you can pass this as an alternative? Or was sockfd before this patch a SOCKET?? Stefan