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 085A8C61DA4 for ; Tue, 14 Feb 2023 13:25:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRvJd-0003yD-4L; Tue, 14 Feb 2023 08:25:49 -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 1pRvJc-0003wI-85 for qemu-devel@nongnu.org; Tue, 14 Feb 2023 08:25:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRvJa-0006dc-Hc for qemu-devel@nongnu.org; Tue, 14 Feb 2023 08:25:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676381144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hbPByCgXhzQzQXfGcnuBb7AmUUrAIE9+zkgEmIbnZiA=; b=i6hGlFWE5qnAsxyOLSIB9l7XS1ittk7BKqAZsitOw36tKXeVRr0z/SVrMgwmZnXGpL6Mlv RvF4UKSlMNg3wX3twsWFoWsH/LTnuLyaACjyaIgfLdwHnPnW6664IlDXTUMZVJlAqyKuMP Ih2HVSi0gvCO7oW2jY8m2oLYMQDwRjQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-102-KbYwmYX4OvK4V15e2g9kBw-1; Tue, 14 Feb 2023 08:25:41 -0500 X-MC-Unique: KbYwmYX4OvK4V15e2g9kBw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AECFC8588E4; Tue, 14 Feb 2023 13:25:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C8571121318; Tue, 14 Feb 2023 13:25:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 49CFC21E6A1F; Tue, 14 Feb 2023 14:25:39 +0100 (CET) From: Markus Armbruster To: marcandre.lureau@redhat.com Cc: qemu-devel@nongnu.org, Beraldo Leal , Eric Blake , Stefan Weil , Alex =?utf-8?Q?Benn?= =?utf-8?Q?=C3=A9e?= , Paolo Bonzini , Laurent Vivier , "Dr. David Alan Gilbert" , Gerd Hoffmann , Michael Roth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Markus Armbruster , Daniel P. =?utf-8?Q?Berrang?= =?utf-8?Q?=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta Subject: Re: [PATCH v3 05/10] qmp: 'add_client' actually expects sockets References: <20230207142535.1153722-1-marcandre.lureau@redhat.com> <20230207142535.1153722-6-marcandre.lureau@redhat.com> Date: Tue, 14 Feb 2023 14:25:39 +0100 In-Reply-To: <20230207142535.1153722-6-marcandre.lureau@redhat.com> (marcandre lureau's message of "Tue, 7 Feb 2023 18:25:30 +0400") Message-ID: <877cwkidkc.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 marcandre.lureau@redhat.com writes: > From: Marc-Andr=C3=A9 Lureau > > Whether it is SPICE, VNC, D-Bus, or the socket chardev, they all > actually expect a socket kind or will fail in different ways at runtime. > > Throw an error early if the given 'add_client' fd is not a socket, and > close it to avoid leaks. > > This allows to replace the close() call with a more correct & portable > closesocket() version. > > (this will allow importing sockets on Windows with a specialized command > in the following patch, while keeping the remaining monitor associated > sockets/add_client code & usage untouched) > > Signed-off-by: Marc-Andr=C3=A9 Lureau > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > --- > monitor/qmp-cmds.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c > index 859012aef4..2dae6bb10f 100644 > --- a/monitor/qmp-cmds.c > +++ b/monitor/qmp-cmds.c > @@ -14,6 +14,7 @@ > */ >=20=20 > #include "qemu/osdep.h" > +#include "qemu/sockets.h" > #include "monitor-internal.h" > #include "monitor/qdev.h" > #include "monitor/qmp-helpers.h" > @@ -139,11 +140,17 @@ void qmp_add_client(const char *protocol, const cha= r *fdname, > return; > } >=20=20 > + if (!fd_is_socket(fd)) { > + error_setg(errp, "add_client expects a socket"); > + close(fd); > + return; > + } > + > for (i =3D 0; i < ARRAY_SIZE(protocol_table); i++) { > if (!strcmp(protocol, protocol_table[i].name)) { > if (!protocol_table[i].add_client(fd, has_skipauth, skipauth, > has_tls, tls, errp)) { > - close(fd); > + closesocket(fd); > } > return; > } > @@ -151,7 +158,7 @@ void qmp_add_client(const char *protocol, const char = *fdname, >=20=20 > if (!qmp_add_client_char(fd, has_skipauth, skipauth, has_tls, tls, > protocol, errp)) { > - close(fd); > + closesocket(fd); > } > } Please update add_client's doc comment in qapi/misc.json to state explicitly that a socket is required.