From nobody Fri Nov 1 05:39:23 2024 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=1708090384; cv=none; d=zohomail.com; s=zohoarc; b=F82eh0gEXCmIWphtlX8zP4F979Iqqf4lSUC6aNwvpKS/AqDZVJj3aozmNkro2xs+7EZhqQkCcfYCb6wRAuqale14Dki3h5OT9+oKc7VFlCjGATohIGO6hm+ZO7MG9+GEVdNEX/SwOB0pe5VcubSiP+2bQnNIs4YO/BRDPY9FaLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090384; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=igDQLQcrsYn/3LYOWPr70op4GGKXO51EJsvBEPe8+hs=; b=k8jOKyg1o78nsvhW4OrPGd9TcBo9tLr0E3bF/+G6Ube3LlXiHPDLh6vx+ERn6QiVixoPRejnNJH9RnnaHsNgciFD0GfgLd2V07iukBDMV7DjE2zAzgQrFgpkNpGcgd9acOxohHINnerH0zMjimg2xpSYKjpSLsDNZ5eym64v3YY= 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 1708090384645501.0030374174514; Fri, 16 Feb 2024 05:33:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKb-0008B7-6l; Fri, 16 Feb 2024 08:32:47 -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 1rayJp-000826-NO for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:05 -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 1rayJn-0006AP-VZ for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:31:57 -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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-394-1nALvRgROeSQnZmvsP0vXw-1; Fri, 16 Feb 2024 08:31:51 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39DEF185A781; Fri, 16 Feb 2024 13:31:51 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 603BA1C066AA; Fri, 16 Feb 2024 13:31:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090315; 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=igDQLQcrsYn/3LYOWPr70op4GGKXO51EJsvBEPe8+hs=; b=Ngufki6CzMIuCDBPkFWT9HAgeKVZ3B7ckv8XCb84T997Jv16eI9auZQK5CU8zZIQAECbOF 6gecDOofAbxJXqpiAi/wpfhWwoaB3BpoVmlodxOvUrJJHfKvdbjQCbd0ZhyFU5NfS3gko6 UeCHF6kZClkuP8dF9a1oUWl6xvjtmOU= X-MC-Unique: 1nALvRgROeSQnZmvsP0vXw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 1/7] ui: reject extended clipboard message if not activated Date: Fri, 16 Feb 2024 17:31:34 +0400 Message-ID: <20240216133140.3611100-2-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.7 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090385470100001 From: Daniel P. Berrang=C3=A9 The extended clipboard message protocol requires that the client activate the extension by requesting a psuedo encoding. If this is not done, then any extended clipboard messages from the client should be considered invalid and the client dropped. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20240115095119.654271-1-berrange@redhat.com> --- ui/vnc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 3db87fd89c..af20d24534 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2445,6 +2445,11 @@ static int protocol_client_msg(VncState *vs, uint8_t= *data, size_t len) } =20 if (read_s32(data, 4) < 0) { + if (!vnc_has_feature(vs, VNC_FEATURE_CLIPBOARD_EXT)) { + error_report("vnc: extended clipboard message while disabl= ed"); + vnc_client_error(vs); + break; + } if (dlen < 4) { error_report("vnc: malformed payload (header less than 4 b= ytes)" " in extended clipboard pseudo-encoding."); --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090465; cv=none; d=zohomail.com; s=zohoarc; b=Enk80fgVtqDiXAATmXri3zJy979V8H6ej3b47Ny0PjKY6DF3i6kpZKfadeFCXNSyUQpNdDieyDrvlHts5dRcd+8g6M31eTi9aVnTa8Xw+usgQ2wBhqbECaipfuB/mSS6q6+VVrYwUIrbsGylgdv3axJsuTEgZtnLhk7V1s6tl3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090465; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ppkVwgaUYdwPeFxpk0uqOP/zHRU1fKPe69aJ32CvN60=; b=Ny5B4wQ4M/IcsxmtxnNouuc0UaafH3KBrGx5Rdty9sFXKk2EoqbRY6BJIeVqsKQ67THWkJNHPY1czWIgXz/JN5y1v5Z6oMhYlR5MLRbn5PCyx0wY7cLK0JXQqTTWEEbbpSXv+Y6hPPrB5ixhlNHI2i6TUIXfSNSPYjOahMbLUcs= 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 1708090465745374.1060623957701; Fri, 16 Feb 2024 05:34:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKf-0008Bk-DF; Fri, 16 Feb 2024 08:32: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 1rayK4-00083p-RY for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:21 -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 1rayJw-0006DV-Iq for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:12 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562--fWgRc42PNyL731qtgvLFQ-1; Fri, 16 Feb 2024 08:31:56 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 096893C100B5; Fri, 16 Feb 2024 13:31:56 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19ACC40166C5; Fri, 16 Feb 2024 13:31:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090319; 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=ppkVwgaUYdwPeFxpk0uqOP/zHRU1fKPe69aJ32CvN60=; b=eU4tTrPqbkPY3X6dOuWcc30FXirQfGysGR1s02z6ZfZpEVO7G0mGuDS9w1bNqX/O/W781i rm5t0rKtRSfCAWnF7yU9GAR9JIL9MXgIq5tuTIVxufkefesr3eNUnKGdwPaiNiFctSO+qz 3mIIgMtzsiC4aqQkY+8y2UFy4pynjoI= X-MC-Unique: -fWgRc42PNyL731qtgvLFQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Fiona Ebner , qemu-stable@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 2/7] ui/clipboard: mark type as not available when there is no data Date: Fri, 16 Feb 2024 17:31:35 +0400 Message-ID: <20240216133140.3611100-3-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.2 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090467851100013 From: Fiona Ebner With VNC, a client can send a non-extended VNC_MSG_CLIENT_CUT_TEXT message with len=3D0. In qemu_clipboard_set_data(), the clipboard info will be updated setting data to NULL (because g_memdup(data, size) returns NULL when size is 0). If the client does not set the VNC_ENCODING_CLIPBOARD_EXT feature when setting up the encodings, then the 'request' callback for the clipboard peer is not initialized. Later, because data is NULL, qemu_clipboard_request() can be reached via vdagent_chr_write() and vdagent_clipboard_recv_request() and there, the clipboard owner's 'request' callback will be attempted to be called, but that is a NULL pointer. In particular, this can happen when using the KRDC (22.12.3) VNC client. Another scenario leading to the same issue is with two clients (say noVNC and KRDC): The noVNC client sets the extension VNC_FEATURE_CLIPBOARD_EXT and initializes its cbpeer. The KRDC client does not, but triggers a vnc_client_cut_text() (note it's not the _ext variant)). There, a new clipboard info with it as the 'owner' is created and via qemu_clipboard_set_data() is called, which in turn calls qemu_clipboard_update() with that info. In qemu_clipboard_update(), the notifier for the noVNC client will be called, i.e. vnc_clipboard_notify() and also set vs->cbinfo for the noVNC client. The 'owner' in that clipboard info is the clipboard peer for the KRDC client, which did not initialize the 'request' function. That sounds correct to me, it is the owner of that clipboard info. Then when noVNC sends a VNC_MSG_CLIENT_CUT_TEXT message (it did set the VNC_FEATURE_CLIPBOARD_EXT feature correctly, so a check for it passes), that clipboard info is passed to qemu_clipboard_request() and the original segfault still happens. Fix the issue by handling updates with size 0 differently. In particular, mark in the clipboard info that the type is not available. While at it, switch to g_memdup2(), because g_memdup() is deprecated. Cc: qemu-stable@nongnu.org Fixes: CVE-2023-6683 Reported-by: Markus Frank Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Fiona Ebner Reviewed-by: Marc-Andr=C3=A9 Lureau Tested-by: Markus Frank Message-ID: <20240124105749.204610-1-f.ebner@proxmox.com> --- ui/clipboard.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/clipboard.c b/ui/clipboard.c index 3d14bffaf8..b3f6fa3c9e 100644 --- a/ui/clipboard.c +++ b/ui/clipboard.c @@ -163,9 +163,15 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, } =20 g_free(info->types[type].data); - info->types[type].data =3D g_memdup(data, size); - info->types[type].size =3D size; - info->types[type].available =3D true; + if (size) { + info->types[type].data =3D g_memdup2(data, size); + info->types[type].size =3D size; + info->types[type].available =3D true; + } else { + info->types[type].data =3D NULL; + info->types[type].size =3D 0; + info->types[type].available =3D false; + } =20 if (update) { qemu_clipboard_update(info); --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090389; cv=none; d=zohomail.com; s=zohoarc; b=CmwVaaQ51sTzVC3WKmCp9q/BqMYALscApM8s5EqgJPUiIeBBm0Owv5Rf7X9IaHUZqynnSEje1oavJJ6SpV2gvOdgmPOrED1+xG7Xl+mf60d5V17L1YD65X9NouKBScXbTWFEIyRCw7Le226CRy/khlekTtppt0U4v19sHClanhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090389; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7J3LwHjvXfp/0gMoISOYuYCZbcxJhpKjc71h88Jg4vI=; b=ToIwlV1KR+cxRDraJH8RXIBpn6DQgzuXrCyakEU7ppNrgeUL125vnxaPQ8S6/ATk3hJPLgvsEGozY8b3mcgiDtCNAqdouF7Vz+uakYeWFYHE54iKeGhyf5AsSv8iEeN4bUhpXkrs08AgQmZUdw6ZAikfVBVwaJAUuMbGckyPUyk= 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 1708090389442724.7204161820673; Fri, 16 Feb 2024 05:33:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKg-0008Cz-OL; Fri, 16 Feb 2024 08:32:50 -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 1rayK6-000848-NQ for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:21 -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 1rayK3-0006Dp-61 for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:13 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-267-LpyI-bqLP5GW-Z7hkEJ_mQ-1; Fri, 16 Feb 2024 08:32:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA9D41C05AFB; Fri, 16 Feb 2024 13:32:01 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82AD314F0; Fri, 16 Feb 2024 13:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090325; 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=7J3LwHjvXfp/0gMoISOYuYCZbcxJhpKjc71h88Jg4vI=; b=MQnwbEymR17QT27voZHRGqvr48IpgfvWqKnaKik9mUpVV9t56OreuIqN4tt0oyWPC15fBl a61H8WMKsihFMwqWO0HzqRlyvnUXjiKKG0QBZEYDxFDZ6cOtBYptREBEliF07ab+0ZTsDn Q8oW/j0phIoA4y8UjFWkCM3dR3SKCDM= X-MC-Unique: LpyI-bqLP5GW-Z7hkEJ_mQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Fiona Ebner , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 3/7] ui/clipboard: add asserts for update and request Date: Fri, 16 Feb 2024 17:31:36 +0400 Message-ID: <20240216133140.3611100-4-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090391830100003 From: Fiona Ebner Should an issue like CVE-2023-6683 ever appear again in the future, it will be more obvious which assumption was violated. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Fiona Ebner Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20240124105749.204610-2-f.ebner@proxmox.com> --- ui/clipboard.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ui/clipboard.c b/ui/clipboard.c index b3f6fa3c9e..4264884a6c 100644 --- a/ui/clipboard.c +++ b/ui/clipboard.c @@ -65,12 +65,24 @@ bool qemu_clipboard_check_serial(QemuClipboardInfo *inf= o, bool client) =20 void qemu_clipboard_update(QemuClipboardInfo *info) { + uint32_t type; QemuClipboardNotify notify =3D { .type =3D QEMU_CLIPBOARD_UPDATE_INFO, .info =3D info, }; assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT); =20 + for (type =3D 0; type < QEMU_CLIPBOARD_TYPE__COUNT; type++) { + /* + * If data is missing, the clipboard owner's 'request' callback ne= eds to + * be set. Otherwise, there is no way to get the clipboard data and + * qemu_clipboard_request() cannot be called. + */ + if (info->types[type].available && !info->types[type].data) { + assert(info->owner && info->owner->request); + } + } + notifier_list_notify(&clipboard_notifiers, ¬ify); =20 if (cbinfo[info->selection] !=3D info) { @@ -132,6 +144,8 @@ void qemu_clipboard_request(QemuClipboardInfo *info, !info->owner) return; =20 + assert(info->owner->request); + info->types[type].requested =3D true; info->owner->request(info, type); } --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090464; cv=none; d=zohomail.com; s=zohoarc; b=D3b6dgSsrBhN6zL2wDLpsnSyzfUXzvUOjc0Ev3ApxIXva4EDMhG15tIS/J9vy46dWMnerhiTsndTMa+fkCeOhqMIx6Whk1OF+fvJsVe3m6C5pKxu80z667HCXYmFQFZ8RIiB7oVeJQ3eGmzOkkAKnJSGy3EKUYThp0kRgWNX/5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090464; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DRNiS6fnueophqvRUGy0xrlqhBIJRqicWKHni30WPZk=; b=VhqqFXnITv6u37s7REFt256i39DaCOirWXY37JQ2qqkpujk+t3IlMhvoGYuqOLAm6XF4g/TpeIefV0a9U0ci58rcvohJo6GfjdQUxtT6BwLljp20i/mE3Q7ZiKTM7iTbndcQV5/9GR404/RfPvoSsyYF+MQn1Y42Vgmd3jj7LMQ= 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 1708090464987619.5237818033967; Fri, 16 Feb 2024 05:34:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKh-0008DI-BS; Fri, 16 Feb 2024 08:32:51 -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 1rayK6-00084A-OI for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:21 -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 1rayK4-0006Ih-E2 for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:13 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-pZsJlJfaNzCpQc4cYOV4rg-1; Fri, 16 Feb 2024 08:32:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AD5F380406F; Fri, 16 Feb 2024 13:32:07 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 439EA2166B4F; Fri, 16 Feb 2024 13:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090331; 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=DRNiS6fnueophqvRUGy0xrlqhBIJRqicWKHni30WPZk=; b=VswOKIdOceAgy+0cj4eAQq4nSpidxxsM7HYXcz+Wozd+0drfzAN7Cdnq3H6Q9zUPLa0+z1 vEBtvfff9C5X294SCYDhZtX6tKvOyK2KjjRG0VYdwsQ3qKMQVBF1hy8hbWfnOerF1bdYIx PbV233m0g0woCBXiBmMgi1HMyadd4w0= X-MC-Unique: pZsJlJfaNzCpQc4cYOV4rg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Tianlan Zhou , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 4/7] ui/console: Fix console resize with placeholder surface Date: Fri, 16 Feb 2024 17:31:37 +0400 Message-ID: <20240216133140.3611100-5-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.6 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090465828100001 From: Tianlan Zhou In `qemu_console_resize()`, the old surface of the console is keeped if the= new console size is the same as the old one. If the old surface is a placeholde= r, and the new size of console is the same as the placeholder surface (640*480= ), the surface won't be replace. In this situation, the surface's `QEMU_PLACEHOLDER_FLAG` flag is still set,= so the console won't be displayed in SDL display mode. This patch fixes this problem by forcing a new surface if the old one is a placeholder. Signed-off-by: Tianlan Zhou Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20240207172024.8-1-bobby825@126.com> --- ui/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c index 7db921e3b7..832055675c 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1577,7 +1577,7 @@ void qemu_console_resize(QemuConsole *s, int width, i= nt height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); =20 if ((s->scanout.kind !=3D SCANOUT_SURFACE || - (surface && surface->flags & QEMU_ALLOCATED_FLAG)) && + (surface && !is_buffer_shared(surface) && !is_placeholder(surface= ))) && qemu_console_get_width(s, -1) =3D=3D width && qemu_console_get_height(s, -1) =3D=3D height) { return; --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090416; cv=none; d=zohomail.com; s=zohoarc; b=EYAANBH7tlAWJ4DAPOWVizqOLA6//lCTwP0Nn7dMblZbYQJQwXfNLXKVBELOLxTz/21Q4kb1FQdyNB7S88Q5qXBZfi5R/bhk9WSIp76YFkgVq+uJFQOYhJNOQXj8r5Lz6DYBpq4CPY6awuCNjUbL8VULB0idtVkCW7D6T/SKC7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090416; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9xERhRwKbIVSH1kZ3wUuvCZ99kxdJayCqnBZCzWQc+g=; b=mNuBnA9n2c9ufWAMowewi0QYAwHLLPm1P9288M28lYKUmrlEcfNgZuuBVG20SMzTBYUZJeGPil2wwo5fdGno//BTjEXlMGTV1MdqAVajXXY+Fma3AdSoVMfzvBhNrmOuyEEZ5gnsKJNLuHVx3lyfZSYlLCOibk89T12DrNyYUNI= 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 1708090416575489.4601024212619; Fri, 16 Feb 2024 05:33:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKg-0008Cd-1C; Fri, 16 Feb 2024 08:32:50 -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 1rayKC-00084n-Ad for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:27 -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 1rayK6-0006L4-GS for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:18 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-b7K0WYAKORWRct-aDh5jSA-1; Fri, 16 Feb 2024 08:32:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C92B4380406C; Fri, 16 Feb 2024 13:32:11 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85CB7C1596E; Fri, 16 Feb 2024 13:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090333; 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=9xERhRwKbIVSH1kZ3wUuvCZ99kxdJayCqnBZCzWQc+g=; b=WYYu4/zxOI7XyTEQZG36fNFsl8aCUw+xo4Xn+sd8qPpYPYO9L6PwBMFlCkPg1W+7uMZTcl Ko3DwR3kfHUNWoj4DAXABH+e2MBHYbVFIw6sCOgcjteweUfLRaPputerq0ruI+quKrjoTI iPnK+PSDz1c3Ig1Wg/cLE5B74O7HLD0= X-MC-Unique: b7K0WYAKORWRct-aDh5jSA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Akihiko Odaki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 5/7] audio: Depend on dbus_display1_dep Date: Fri, 16 Feb 2024 17:31:38 +0400 Message-ID: <20240216133140.3611100-6-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.8 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090418194100001 From: Akihiko Odaki dbusaudio needs dbus_display1_dep. Fixes: 739362d4205c ("audio: add "dbus" audio backend") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20240214-dbus-v7-1-7eff29f04c34@daynix.com> --- audio/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/meson.build b/audio/meson.build index c8f658611f..608f35e6af 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -30,7 +30,8 @@ endforeach =20 if dbus_display module_ss =3D ss.source_set() - module_ss.add(when: [gio, pixman], if_true: files('dbusaudio.c')) + module_ss.add(when: [gio, dbus_display1_dep, pixman], + if_true: files('dbusaudio.c')) audio_modules +=3D {'dbus': module_ss} endif =20 --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090465; cv=none; d=zohomail.com; s=zohoarc; b=jPrFAhySwsrzH+fQxB8t0ebVuLg7BP3XQXQR5cH71rpkA7X7bkPs2rgoWQ+3AO3YtNJAQINzdRseFHnga9uwQb/g5nd5B8uKJwGCEEY3TYdGH2U6d1/ETV07OrjGGLIyknDRqAbHEYh4OZbY9y0zpFrLpeuvvAKdwEEjj8iFlt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090465; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j+PGkftYRQLJedntQHLiPAkKi0Q7ccoEaGbQ//pNECY=; b=aq3P1hMk94tYqmQWCMJUXlHymiG+PygFr/AgnFr1tAVt5lgfJ7djwsJWYKHfCXIXb1yG4NWN3yiKtnpZEoZSeRNBF922ID0/lXQMwfdJAphtz8fnSQakLs3xbGgWzKqvPoWpAm+7Hgf52g8NlbaOM+Z8plCxS/e/1+56QU8R+vM= 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 1708090465683902.3706103481098; Fri, 16 Feb 2024 05:34:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKf-0008BZ-A7; Fri, 16 Feb 2024 08:32: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 1rayKE-00084w-GD for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:28 -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 1rayKD-0006Ml-2p for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:22 -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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-605-5BS_OfqrOU6IKTeGEVJP0w-1; Fri, 16 Feb 2024 08:32:17 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 40E14185A781; Fri, 16 Feb 2024 13:32:17 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DC18C1596E; Fri, 16 Feb 2024 13:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090339; 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=j+PGkftYRQLJedntQHLiPAkKi0Q7ccoEaGbQ//pNECY=; b=LyquYHTT08ahMRUN8IHHyHkBkXr9oo2risObPRrAtce9yzBpglM8K0hn3iG/6wkPiiymYA 55ICLVt9C6Rw5NJLDYdJabPGfrTwDLgYaiJyVGD3S/1ruwIfFDLNzU0JMg17Fr4qQmQ4V9 sbD1I+dGoqFftwnjpIVUe8F+1CDkkAg= X-MC-Unique: 5BS_OfqrOU6IKTeGEVJP0w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Akihiko Odaki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 6/7] meson: Explicitly specify dbus-display1.h dependency Date: Fri, 16 Feb 2024 17:31:39 +0400 Message-ID: <20240216133140.3611100-7-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.8 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090467831100011 From: Akihiko Odaki Explicitly specify dbus-display1.h as a dependency so that files depending on it will not get compiled too early. Fixes: 1222070e7728 ("meson: ensure dbus-display generated code is built be= fore other units") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20240214-dbus-v7-2-7eff29f04c34@daynix.com> --- ui/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/meson.build b/ui/meson.build index 376e0d771b..0b7e2b6f6b 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -91,7 +91,7 @@ if dbus_display '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@= ']) dbus_display1_lib =3D static_library('dbus-display1', dbus_display1, dep= endencies: gio) - dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, i= nclude_directories: include_directories('.')) + dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, s= ources: dbus_display1[0]) dbus_ss.add(when: [gio, dbus_display1_dep], if_true: [files( 'dbus-chardev.c', --=20 2.43.1 From nobody Fri Nov 1 05:39:23 2024 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=1708090436; cv=none; d=zohomail.com; s=zohoarc; b=fuc+E2OHTM6YVefuCDxfDSGBQ7gix2hPhxPvAxbpW6NnqrWaXpDgTCE+KOQjIGGwPouvNwTume9ZPVRTmfezOMMq1sF/Lj/v3NQOAiEIa5foeBC5V+7At2go8LImjhoegRklNB1kXhAOJLwQAtzoBPBEWJyv9GVo13wxMkG83ZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708090436; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tu3DHk1iTGtKRTIQeVq1Cu0Dwm5bCzOscb4Lav+qPig=; b=NpmoCC4CKTBu/qddtXKfzMfWE7L9g5TJlxEfh5E05JQesbcfC7tbYyaS3pgact3wu/miC5bzGrzBNUWVTL/32kU88LMBZMNIxThZNAZF9jN8KHLgf4Td5NEtMaHtrM5jlul40NL7gXUifAMryeMwcwPQfnH1lB5EbE4jXfe3zBU= 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 1708090436519615.7073615978953; Fri, 16 Feb 2024 05:33:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rayKh-0008Dc-M2; Fri, 16 Feb 2024 08:32:51 -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 1rayKR-00086i-0b for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:37 -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 1rayKK-0006Qg-B1 for qemu-devel@nongnu.org; Fri, 16 Feb 2024 08:32:34 -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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-61-xD6OSEf-NqGOemyotYVdDg-1; Fri, 16 Feb 2024 08:32:21 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9AE28881BC1; Fri, 16 Feb 2024 13:32:21 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ACCA2026D06; Fri, 16 Feb 2024 13:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708090345; 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=Tu3DHk1iTGtKRTIQeVq1Cu0Dwm5bCzOscb4Lav+qPig=; b=EfGqQtQ9a1Td5tdv6OWJt22DrmVMgBIPMgT5Frcl0U4ZD6G8fT2veVvxXBR7vbPAC3YXla zk4+9wqfvhz3C56wgEv3HJQck7r8ReR3yXTQzcAg4mbip6LPJnf/eA6Vb6/Mp0SCuEn2XG mKtrqmZfTgisLK6aVBYUECsViN3JEms= X-MC-Unique: xD6OSEf-NqGOemyotYVdDg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, Akihiko Odaki , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PULL 7/7] tests/qtest: Depend on dbus_display1_dep Date: Fri, 16 Feb 2024 17:31:40 +0400 Message-ID: <20240216133140.3611100-8-marcandre.lureau@redhat.com> In-Reply-To: <20240216133140.3611100-1-marcandre.lureau@redhat.com> References: <20240216133140.3611100-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.4.1 on 10.11.54.4 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.364, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1708090437690100001 From: Akihiko Odaki It ensures dbus-display1.c will not be recompiled. Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20240214-dbus-v7-3-7eff29f04c34@daynix.com> --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 2b89e8634b..430d49b409 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -344,7 +344,7 @@ if vnc.found() endif =20 if dbus_display - qtests +=3D {'dbus-display-test': [dbus_display1, gio]} + qtests +=3D {'dbus-display-test': [dbus_display1_dep, gio]} endif =20 qtest_executables =3D {} --=20 2.43.1