From nobody Wed Nov 5 16:42:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496928158250187.49145703193096; Thu, 8 Jun 2017 06:22:38 -0700 (PDT) Received: from localhost ([::1]:49582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxOW-0000YP-Ku for importer@patchew.org; Thu, 08 Jun 2017 09:22:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxJG-0004NK-Ch for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:17:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxJA-0002EA-Lx for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:17:10 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:14895) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIxJA-0002D2-EW for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:17:04 -0400 X-IronPort-AV: E=Sophos;i="5.39,315,1493683200"; d="scan'208";a="435636365" From: Owen Smith To: Date: Thu, 8 Jun 2017 13:15:34 +0000 Message-ID: <1496927734-29174-5-git-send-email-owen.smith@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496927734-29174-1-git-send-email-owen.smith@citrix.com> References: <1496927734-29174-1-git-send-email-owen.smith@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH 4/4] xenfb: Fix leak by adding/removing keyboard handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: anthony.perard@citrix.com, xen-devel@lists.xenproject.org, sstabellini@kernel.org, kraxel@redhat.com, Owen Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Calls qemu_remove_kbd_event_handler that frees its memory, instead of adding (and allocating some memory) a new NULL handler. Signed-off-by: Owen Smith --- hw/display/xenfb.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index b0a5726..570ecdb 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -55,6 +55,7 @@ struct XenInput { int vkbd_standalone; /* Guest supports vkbd without vfb device */ int button_state; /* Last seen pointer button state */ int extended; + QEMUPutKbdEntry *qkbd; QEMUPutMouseEntry *qmouse; }; =20 @@ -365,7 +366,6 @@ static int input_initialise(struct XenDevice *xendev) if (rc !=3D 0) return rc; =20 - qemu_add_kbd_event_handler(xenfb_key_event, in); return 0; } =20 @@ -378,10 +378,14 @@ static void input_connected(struct XenDevice *xendev) in->abs_pointer_wanted =3D 0; } =20 + if (in->qkbd) { + qemu_remove_kbd_event_handler(in->qkbd); + } if (in->qmouse) { qemu_remove_mouse_event_handler(in->qmouse); } trace_xenfb_input_connected(xendev, in->abs_pointer_wanted); + in->qkbd =3D qemu_add_kbd_event_handler(xenfb_key_event, in); in->qmouse =3D qemu_add_mouse_event_handler(xenfb_mouse_event, in, in->abs_pointer_wanted, "Xen PVFB Mouse"); @@ -392,11 +396,14 @@ static void input_disconnect(struct XenDevice *xendev) { struct XenInput *in =3D container_of(xendev, struct XenInput, c.xendev= ); =20 + if (in->qkbd) { + qemu_remove_kbd_event_handler(in->qkbd); + in->qkbd =3D NULL; + } if (in->qmouse) { qemu_remove_mouse_event_handler(in->qmouse); in->qmouse =3D NULL; } - qemu_add_kbd_event_handler(NULL, NULL); common_unbind(&in->c); } =20 --=20 2.1.4