Patchwork un-register kbd driver in case of USB kbd unplug.

login
register
mail settings
Submitter Jes Sorensen
Date June 8, 2010, 10:43 a.m.
Message ID <1275993831-31425-2-git-send-email-Jes.Sorensen@redhat.com>
Download mbox | patch
Permalink /patch/54959/
State New
Headers show

Comments

Jes Sorensen - June 8, 2010, 10:43 a.m.
From: Jes Sorensen <Jes.Sorensen@redhat.com>

If a USB keyboard is unplugged, the keyboard eventhandler is never
removed, and events will continue to be passed through to the device,
causing crashes or memory corruption.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 console.h    |    1 +
 hw/usb-hid.c |    3 +++
 input.c      |    6 ++++++
 3 files changed, 10 insertions(+), 0 deletions(-)

Patch

diff --git a/console.h b/console.h
index cac959f..aafb031 100644
--- a/console.h
+++ b/console.h
@@ -42,6 +42,7 @@  typedef struct QEMUPutLEDEntry {
 } QEMUPutLEDEntry;
 
 void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);
+void qemu_remove_kbd_event_handler(void);
 QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
                                                 void *opaque, int absolute,
                                                 const char *name);
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 8e6c6e0..333b626 100644
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -856,6 +856,9 @@  static void usb_hid_handle_destroy(USBDevice *dev)
 
     if (s->kind != USB_KEYBOARD)
         qemu_remove_mouse_event_handler(s->ptr.eh_entry);
+    if (s->kind == USB_KEYBOARD)
+        qemu_remove_kbd_event_handler();
+
     /* TODO: else */
 }
 
diff --git a/input.c b/input.c
index 651442d..ec05548 100644
--- a/input.c
+++ b/input.c
@@ -42,6 +42,12 @@  void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)
     qemu_put_kbd_event = func;
 }
 
+void qemu_remove_kbd_event_handler(void)
+{
+    qemu_put_kbd_event_opaque = NULL;
+    qemu_put_kbd_event = NULL;
+}
+
 static void check_mode_change(void)
 {
     static int current_is_absolute, current_has_absolute;