From nobody Sun Nov 24 09:47:52 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=1724159547; cv=none; d=zohomail.com; s=zohoarc; b=BLMuCx9r7++qXp+1MY5VF0+PLwFz70Q58qQuGj0vpD9LjOH6UIkfXIWjTIjTk504rA7DQ692zBE7aJeHfUu+HPUFMxqQWVcNjfd++ni9SdFb+0B4sQjDGdTrvLpxqYjP86OSO7qO/Vyi38pQIvFm30KsvmKgrBOsJWcsPU0nEuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724159547; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/2wkUCHMj0/DcjKE45YY9tyb/3KmpGSqzxZpX55Ytmo=; b=M02+u2cb0b4St0YtD1coV5ZjQ5i8RCZJyGdGdZupHdzZMVKIt9YwW4CmonFCSgSbtEmzkW6koQzmtuXCZsUbu2E42i53WV1lqypN6YKRNaA9F6WuyYDYh8qumVVz2S4N7Wg8QZx1OCc8TNHMHFzCt3DEqGXopi5D6llGPqvhSZw= 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 1724159547898619.5588496719314; Tue, 20 Aug 2024 06:12:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgOe3-0007Rm-1H; Tue, 20 Aug 2024 09:11:31 -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 1sgOe1-0007OS-2K for qemu-devel@nongnu.org; Tue, 20 Aug 2024 09:11:29 -0400 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 1sgOdy-0005eg-Ps for qemu-devel@nongnu.org; Tue, 20 Aug 2024 09:11:28 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-173-9_8jm1OOPMaEKx83sKlczg-1; Tue, 20 Aug 2024 09:11:20 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BDD7C1955D54; Tue, 20 Aug 2024 13:11:18 +0000 (UTC) Received: from localhost (unknown [10.39.208.36]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 797C01955F2D; Tue, 20 Aug 2024 13:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724159484; 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=/2wkUCHMj0/DcjKE45YY9tyb/3KmpGSqzxZpX55Ytmo=; b=DVtwu+TtEPOxEc7BaviV1mijsmLMXjf2wlqbtv+nlhNZRkctcpSU9FE0bP0gCDhCNkJtPb vwP0jrg3tdvs2ZLZE6tA68IsR6cm4Q5enfpFcSxpZLHA2KwivVUIvyygvImU7ou3NQBlCC UgQX10R8pefvv8F6+bqFGZclVfOYNTQ= X-MC-Unique: 9_8jm1OOPMaEKx83sKlczg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: akihiko.odaki@daynix.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-stable@nongnu.org Subject: [PATCH] vnc: fix crash when no console attached Date: Tue, 20 Aug 2024 17:11:12 +0400 Message-ID: <20240820131112.1267954-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.0 on 10.30.177.17 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: 1724159549304116600 From: Marc-Andr=C3=A9 Lureau Since commit e99441a3793b5 ("ui/curses: Do not use console_select()") qemu_text_console_put_keysym() no longer checks for NULL console argument, which leads to a later crash: Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault. 0x00005555559ee186 in qemu_text_console_handle_keysym (s=3D0x0, keysym=3D31= ) at ../ui/console-vc.c:332 332 } else if (s->echo && (keysym =3D=3D '\r' || keysym =3D=3D '\n'= )) { (gdb) bt #0 0x00005555559ee186 in qemu_text_console_handle_keysym (s=3D0x0, keysym= =3D31) at ../ui/console-vc.c:332 #1 0x00005555559e18e5 in qemu_text_console_put_keysym (s=3D, keysym=3D) at ../ui/console.c:303 #2 0x00005555559f2e88 in do_key_event (vs=3Dvs@entry=3D0x5555579045c0, do= wn=3Ddown@entry=3D1, keycode=3Dkeycode@entry=3D60, sym=3Dsym@entry=3D65471)= at ../ui/vnc.c:2034 #3 0x00005555559f845c in ext_key_event (vs=3D0x5555579045c0, down=3D1, sy= m=3D65471, keycode=3D) at ../ui/vnc.c:2070 #4 protocol_client_msg (vs=3D0x5555579045c0, data=3D, len= =3D) at ../ui/vnc.c:2514 #5 0x00005555559f515c in vnc_client_read (vs=3D0x5555579045c0) at ../ui/v= nc.c:1607 Fixes: e99441a3793b5 ("ui/curses: Do not use console_select()") Fixes: https://issues.redhat.com/browse/RHEL-50529 Cc: qemu-stable@nongnu.org Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Akihiko Odaki Reviewed-by: Michael Tokarev --- ui/vnc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index dae5d51210..5057ec8680 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1935,7 +1935,7 @@ static void do_key_event(VncState *vs, int down, int = keycode, int sym) } =20 qkbd_state_key_event(vs->vd->kbd, qcode, down); - if (!qemu_console_is_graphic(vs->vd->dcl.con)) { + if (QEMU_IS_TEXT_CONSOLE(vs->vd->dcl.con)) { QemuTextConsole *con =3D QEMU_TEXT_CONSOLE(vs->vd->dcl.con); bool numlock =3D qkbd_state_modifier_get(vs->vd->kbd, QKBD_MOD_NUM= LOCK); bool control =3D qkbd_state_modifier_get(vs->vd->kbd, QKBD_MOD_CTR= L); --=20 2.45.2.827.g557ae147e6