From nobody Sun May 12 15:45: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=1694441266; cv=none; d=zohomail.com; s=zohoarc; b=c2ExU4erO+D0p1WexgRCGh5SzWLDWQmsnZhvvOrPsXYHXJ95DhfqE1SIonj7ExWjxTniegW+a3AYt5YGajZf/Po4I8b3JhDL8LLZksxbosIcn5iT8U3u31o0gPf+njcFnCG9A3e2Dj/9eacytCz2yE5aHfLQJLCjDPBpr+h2uBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694441266; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=+SgllIFI5L9IOdrQ+YDs8a8nEVYnJMUhWYTS6rLCG9E=; b=APH5CrPcGwoCsC72C3NeXqxwZtbrGIiQEVMlo0YUgBozvQc4JIEdFV1j07Zfmk4x3RN7m8PHcCSWCvXssqlZ+PFGJ56yCyL/MKPQeIFwYGEuMmbatJGP8/EWgLe1ejNmVhB1KBBde+lAAku0NnZZwqAu1TcZQdawOCdklq+zvew= 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 1694441266786641.1973458735143; Mon, 11 Sep 2023 07:07:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfhYu-0003c9-6V; Mon, 11 Sep 2023 10:06:48 -0400 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 1qfhYs-0003bn-Gw for qemu-devel@nongnu.org; Mon, 11 Sep 2023 10:06:46 -0400 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 1qfhYq-0006gL-1X for qemu-devel@nongnu.org; Mon, 11 Sep 2023 10:06:46 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-156-GsmqYr_9PeybMHmzwES1HA-1; Mon, 11 Sep 2023 10:06:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D18929ABA36 for ; Mon, 11 Sep 2023 14:06:41 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8B1240C2009; Mon, 11 Sep 2023 14:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694441203; 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; bh=+SgllIFI5L9IOdrQ+YDs8a8nEVYnJMUhWYTS6rLCG9E=; b=iqR6UF+r/3gv029BnrX1hMjfI9MGVGWnxXYGID5pd1pFH6VeVP1vscySP3RMwqM3AJ2eth JAuz4KWP7Ik7C88lI34c86WKQ631LK46Vg6sLXt4dqfaxkBgmODkPog9kbHXiJ2/f42qOF P3HbaEIm+bvZByTtKIjC5Or5mEnaZGw= X-MC-Unique: GsmqYr_9PeybMHmzwES1HA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PATCH] ui: fix crash when there are no active_console Date: Mon, 11 Sep 2023 18:06:38 +0400 Message-ID: <20230911140638.1458156-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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1694441269936100001 From: Marc-Andr=C3=A9 Lureau Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault. 0x0000555555888630 in dpy_ui_info_supported (con=3D0x0) at ../ui/console.c:= 812 812 return con->hw_ops->ui_info !=3D NULL; (gdb) bt #0 0x0000555555888630 in dpy_ui_info_supported (con=3D0x0) at ../ui/consol= e.c:812 #1 0x00005555558a44b1 in protocol_client_msg (vs=3D0x5555578c76c0, data=3D= 0x5555581e93f0 , len=3D24) at ../ui/vnc.c:2585 #2 0x00005555558a19ac in vnc_client_read (vs=3D0x5555578c76c0) at ../ui/vn= c.c:1607 #3 0x00005555558a1ac2 in vnc_client_io (ioc=3D0x5555581eb0e0, condition=3D= G_IO_IN, opaque=3D0x5555578c76c0) at ../ui/vnc.c:1635 Fixes: https://issues.redhat.com/browse/RHEL-2600 Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ui/console.c b/ui/console.c index 90ae4be602..0f31ecece6 100644 --- a/ui/console.c +++ b/ui/console.c @@ -808,6 +808,9 @@ bool dpy_ui_info_supported(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return false; + } =20 return con->hw_ops->ui_info !=3D NULL; } @@ -817,6 +820,9 @@ const QemuUIInfo *dpy_get_ui_info(const QemuConsole *co= n) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return NULL; + } =20 return &con->ui_info; } @@ -826,6 +832,9 @@ int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info,= bool delay) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return -1; + } =20 if (!dpy_ui_info_supported(con)) { return -1; @@ -1401,6 +1410,10 @@ QEMUCursor *qemu_console_get_cursor(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return NULL; + } + return QEMU_IS_GRAPHIC_CONSOLE(con) ? QEMU_GRAPHIC_CONSOLE(con)->curso= r : NULL; } =20 @@ -1414,6 +1427,10 @@ bool qemu_console_is_graphic(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return false; + } + return con && QEMU_IS_GRAPHIC_CONSOLE(con); } =20 @@ -1422,6 +1439,10 @@ bool qemu_console_is_fixedsize(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return false; + } + return con && (QEMU_IS_GRAPHIC_CONSOLE(con) || QEMU_IS_FIXED_TEXT_CONS= OLE(con)); } =20 @@ -1493,6 +1514,10 @@ int qemu_console_get_index(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } + if (con =3D=3D NULL) { + return -1; + } + return con ? con->index : -1; } =20 --=20 2.41.0