From nobody Fri Nov 1 07:26:53 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