From nobody Sat Nov 15 09:31:56 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1753276879; cv=none; d=zohomail.com; s=zohoarc; b=jLpJkbN2uV7T/uIDXppRJMQJ3O4J/hWXaEOlY01pUv4Jw3pZHv7v8WCYcKlmz0jULQBhjm3OkFDBDuzXVTyvGV2rXkGX9WwC3iYMx1ScEjyOiLVmRSBLVu3661PZYsT0MFkF0mZryrwAX8+1ZaraB714kpfJBMOD/xyC4YlSWS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753276879; h=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=QGoDYhwH7grYDUZs7DTRUsOWhob0TnbUWWOMhLUtrYM=; b=mOwxp+E6iz0YngyuKNnwLOPkxivRdNRZtu9RsuvwYqWbGs+1C3HymjtCw3tdaMyVd2nMwlynnNNsGDNRG7IUi1dlclDURD0+JkwrUyKNxi0jul4hekuuuZ6LGb0fV8aq9TIzDwK8aP4DKRczAdyxY7q1PFxAve3pLaWSbNUqQR8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753276879252762.3687030607716; Wed, 23 Jul 2025 06:21:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ueZOJ-0006bj-JB; Wed, 23 Jul 2025 09:20:15 -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 1ueZJY-00044g-Nw for qemu-devel@nongnu.org; Wed, 23 Jul 2025 09:15:31 -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 1ueZJS-0002Gi-Vk for qemu-devel@nongnu.org; Wed, 23 Jul 2025 09:15:17 -0400 Received: from mx-prod-mc-01.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-683-jcl-T2PwPn-imj9QKD7mjA-1; Wed, 23 Jul 2025 09:15:08 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5AF551944D01 for ; Wed, 23 Jul 2025 13:15:07 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.2]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 135C119560A0 for ; Wed, 23 Jul 2025 13:15:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 582E321E6A27; Wed, 23 Jul 2025 15:15:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753276509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QGoDYhwH7grYDUZs7DTRUsOWhob0TnbUWWOMhLUtrYM=; b=H8wz1+RQ6sgxzG1uTnxek4FofubZnwtmq+OZiP+VMkBXMo720NnoX7sJaJEZ6PKvPZ4pHz 7MgtuHJpTaYEdC9yniUARCOAqCYT4CVisYrTN6DUF97f1v+o/cMQehQFRW3u1tEtnZhxp3 H3kKlwXmPbzIbNCKXgqhAersgsfLrLc= X-MC-Unique: jcl-T2PwPn-imj9QKD7mjA-1 X-Mimecast-MFC-AGG-ID: jcl-T2PwPn-imj9QKD7mjA_1753276507 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, kraxel@redhat.com Subject: [PATCH] ui/keymaps: Avoid trace crash and improve error messages Date: Wed, 23 Jul 2025 15:15:04 +0200 Message-ID: <20250723131504.1482657-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=armbru@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.377, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1753276881687116600 Content-Type: text/plain; charset="utf-8" parse_keyboard_layout() passes a possibly null @filename to trace_keymap_parse(). Trace backend log then formats it with %s, which crashes on some systems. Fix by moving the null check before the trace_keymap_parse(). While there, improve the error messages a bit. Fixes: d3b787fa7dde (keymaps: add tracing) Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/keymaps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/keymaps.c b/ui/keymaps.c index 6ceaa97085..2359dbfe7e 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -86,19 +86,25 @@ static int parse_keyboard_layout(kbd_layout_t *k, const name2keysym_t *table, const char *language, Error **errp) { + g_autofree char *filename =3D NULL; int ret; FILE *f; - char * filename; char line[1024]; char keyname[64]; int len; =20 filename =3D qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language); + if (!filename) { + error_setg(errp, "could not find keymap file for language '%s'", + language); + return -1; + } + trace_keymap_parse(filename); - f =3D filename ? fopen(filename, "r") : NULL; - g_free(filename); + + f =3D fopen(filename, "r"); if (!f) { - error_setg(errp, "could not read keymap file: '%s'", language); + error_setg_file_open(errp, errno, filename); return -1; } =20 --=20 2.49.0