From nobody Tue Feb 10 11:15:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675781610; cv=none; d=zohomail.com; s=zohoarc; b=lHrX8/iZTdyY9JNGtef2/SEZvMrWq4YTZ/1XwveJBtQ73/pDeK1cqz164IK6VjHhhPy/R8YiF7i8CqgfSpcbypBLW48nqNU0kYpJVoSvbO0WBRPp+TxjM3H+Yao+KItwAszJPwI1yRxPljFpb/qVc62OB641HPrwoyqW61WHfgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675781610; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jfZzp9eQLx9MzCy7m7jEMvZMxYSSx6xPAtQ18jaeEig=; b=M+c0GGhCCKB/7HoXkr+NuBkX9x1Gj2S9d/xbKsC2fr9zAXvS1cqMtvFaA/273ylBNahTI5isGg+JFI1mmniiFMKfjGMjPAB9g1GafIZbkfZ7TyelKA+fwbiiP5KUXQnHTS2VOv/h7xJFYsuGQriK9MzkaCUPeaq29BPK5S28o8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167578161063549.97307427492615; Tue, 7 Feb 2023 06:53:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPOvC-0007Tg-JZ; Tue, 07 Feb 2023 09:26:10 -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 1pPOv9-0007Rd-Co for qemu-devel@nongnu.org; Tue, 07 Feb 2023 09:26:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPOv7-0006GZ-RN for qemu-devel@nongnu.org; Tue, 07 Feb 2023 09:26:07 -0500 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-41-80_2HFKINESTIMmTKiZqQA-1; Tue, 07 Feb 2023 09:26:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F783857AA4; Tue, 7 Feb 2023 14:26:01 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A67D401014C; Tue, 7 Feb 2023 14:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675779965; 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=jfZzp9eQLx9MzCy7m7jEMvZMxYSSx6xPAtQ18jaeEig=; b=L4v+ID4hYjFvNrnpgyMzxQ9WGqoLC2Lxnwuu/e4ztDQ/JlFE1vjo7Sko4f5fQo8mVlly0U 6YXlXEm3sGkaIcmsqHETnOBV5sb/kvA2/et4GBN+FtNpsYr39m76H1qOE+50nfYi9aRypI q2Ki0XPMetnj4bGNvpbRT1RoRZA/nrM= X-MC-Unique: 80_2HFKINESTIMmTKiZqQA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Beraldo Leal , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eric Blake , Stefan Weil , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Laurent Vivier , "Dr. David Alan Gilbert" , Gerd Hoffmann , Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta Subject: [PATCH v3 05/10] qmp: 'add_client' actually expects sockets Date: Tue, 7 Feb 2023 18:25:30 +0400 Message-Id: <20230207142535.1153722-6-marcandre.lureau@redhat.com> In-Reply-To: <20230207142535.1153722-1-marcandre.lureau@redhat.com> References: <20230207142535.1153722-1-marcandre.lureau@redhat.com> 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.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675781611008100001 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 #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 char = *fdname, return; } =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 *f= dname, =20 if (!qmp_add_client_char(fd, has_skipauth, skipauth, has_tls, tls, protocol, errp)) { - close(fd); + closesocket(fd); } } =20 --=20 2.39.1