From nobody Sat May 18 08:14:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619777833; cv=none; d=zohomail.com; s=zohoarc; b=lrDBDraxZ6Vc1B7ksvip53GIwa5rSiNGfG6l9Ro5fg89tHb73+jsMPAuQd1BTD0dMJjow6LleH22BdnKKmi0tfB402vtsXnMiElro65Enf0S+IPzK5j0hlqFKRYpZAnW3zZk1S2aVLfmvckeC1RjyYshWqnpAJETFXxHpWRx5Q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619777833; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=uwbbRehc1l7qUNtgv1o6k50Kfl46adZ8tUiPqdMAcBU=; b=l+dU5WVWmubrtfgV3cD9fRue+gZdKhWuWF689H5PBJyMBehYqiGsIJPEme0NpIloEb+Acmv2ZjbPkuqD1+oPc47H6KbC9T/PMjFbEXmZxecSYh/Ol23OJsomGZjO8pNmzIkEchW3Fnw9EaCiQuXhnn+p9PZJFhzi0z2upzrtYA0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1619777833662849.0812020329715; Fri, 30 Apr 2021 03:17:13 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-EdNDDKAiPWCkMIVAGnfaQQ-1; Fri, 30 Apr 2021 06:17:10 -0400 Received: by mail-wr1-f71.google.com with SMTP id r12-20020adfc10c0000b029010d83323601so3025001wre.22 for ; Fri, 30 Apr 2021 03:17:10 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id n10sm1772394wrw.37.2021.04.30.03.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 03:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619777832; 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=uwbbRehc1l7qUNtgv1o6k50Kfl46adZ8tUiPqdMAcBU=; b=AdOhD3ieB6CBDgHmn7niHUdSZeT+5iyIxcRqWSxcbL+3ehTkaDzwty67r6C4fmQ5y7gf7+ x4ckWDVTlulVBNnu2ZSryizoSBRLg7WcRuBRaUyx3Ldth/LfTczdYi1UZKls663DaL3cpY xPKBPDXCHMRd87R1v+DzavUIQnS379o= X-MC-Unique: EdNDDKAiPWCkMIVAGnfaQQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uwbbRehc1l7qUNtgv1o6k50Kfl46adZ8tUiPqdMAcBU=; b=DaGSoB2y1rv/OwaXME6jCh7r3Oyw3L6/kb0XCW7DHnvf+jI2WFRL4evcIHYZgwfRbl 75E0kZ4TJUUuxlU7Kg5/fKAxOd+m/DLfdeoz0Ln9oMbDhhzvaZnrsEOosQlHglZPDeDw NPhP5+NVbfSpEOcA7m2YEwh6xgqm6sDAYZJnA20viCZVee+jyDAbD0Lco3I+8t266iK9 +yR3bjipt+pfwm1mj8EULsFF6GdUPbxfp7ztHvLhRUylE7LeA14jPNabeS9oDjpoo/Vq bv7k/2eFdgJn4Hs2JqasIzaTVBcwYSqpyyV9TDfIzIOGAZrfxky80MkawQUMKkNdCMdZ XFnw== X-Gm-Message-State: AOAM532G/rRs52OtCh03bkCbQpi+i5H9mcaEY/YS+mA5YzvCj953bS4M e6Eie1zqGzD2WVc86cO88k82y5ffuu/u5/y5YJTbsxBYvJxI08n6XhzSmAcAOin/Zsd3HSQNc/U sVeaKl2qyCDRaTw== X-Received: by 2002:adf:90f0:: with SMTP id i103mr5659694wri.318.1619777829500; Fri, 30 Apr 2021 03:17:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySLJ6DufYg4QOo5a9OUr1zhE59NEQh6pDdIVnH6DurLJlj9AdwZslmZmQ34p7GdMs56Df7MA== X-Received: by 2002:adf:90f0:: with SMTP id i103mr5659679wri.318.1619777829361; Fri, 30 Apr 2021 03:17:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] ui: Fix memory leak in qemu_xkeymap_mapping_table() Date: Fri, 30 Apr 2021 12:17:06 +0200 Message-Id: <20210430101707.245126-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Refactor qemu_xkeymap_mapping_table() to have a single exit point, so we can easily free the memory allocated by XGetAtomName(), This fixes when running a binary configured with --enable-sanitizers: Direct leak of 22 byte(s) in 1 object(s) allocated from: #0 0x561344a7473f in malloc (qemu-system-x86_64+0x1dab73f) #1 0x7fa4d9dc08aa in XGetAtomName (/lib64/libX11.so.6+0x2a8aa) Fixes: 2ec78706d18 ("ui: convert GTK and SDL1 frontends to keycodemapdb") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/x_keymap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/x_keymap.c b/ui/x_keymap.c index 555086fb6bd..2ce7b899615 100644 --- a/ui/x_keymap.c +++ b/ui/x_keymap.c @@ -56,6 +56,7 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, s= ize_t *maplen) { XkbDescPtr desc; const gchar *keycodes =3D NULL; + const guint16 *map; =20 /* There is no easy way to determine what X11 server * and platform & keyboard driver is in use. Thus we @@ -83,21 +84,21 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy,= size_t *maplen) if (check_for_xwin(dpy)) { trace_xkeymap_keymap("xwin"); *maplen =3D qemu_input_map_xorgxwin_to_qcode_len; - return qemu_input_map_xorgxwin_to_qcode; + map =3D qemu_input_map_xorgxwin_to_qcode; } else if (check_for_xquartz(dpy)) { trace_xkeymap_keymap("xquartz"); *maplen =3D qemu_input_map_xorgxquartz_to_qcode_len; - return qemu_input_map_xorgxquartz_to_qcode; + map =3D qemu_input_map_xorgxquartz_to_qcode; } else if ((keycodes && g_str_has_prefix(keycodes, "evdev")) || (XKeysymToKeycode(dpy, XK_Page_Up) =3D=3D 0x70)) { trace_xkeymap_keymap("evdev"); *maplen =3D qemu_input_map_xorgevdev_to_qcode_len; - return qemu_input_map_xorgevdev_to_qcode; + map =3D qemu_input_map_xorgevdev_to_qcode; } else if ((keycodes && g_str_has_prefix(keycodes, "xfree86")) || (XKeysymToKeycode(dpy, XK_Page_Up) =3D=3D 0x63)) { trace_xkeymap_keymap("kbd"); *maplen =3D qemu_input_map_xorgkbd_to_qcode_len; - return qemu_input_map_xorgkbd_to_qcode; + map =3D qemu_input_map_xorgkbd_to_qcode; } else { trace_xkeymap_keymap("NULL"); g_warning("Unknown X11 keycode mapping '%s'.\n" @@ -109,6 +110,10 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy= , size_t *maplen) " - xprop -root\n" " - xdpyinfo\n", keycodes ? keycodes : ""); - return NULL; + map =3D NULL; } + if (keycodes) { + XFree((void *)keycodes); + } + return map; } --=20 2.26.3