summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-03-30 20:47:32 +0400
committerKyle McMartin <kyle@hera.kernel.org>2006-03-30 21:48:59 +0400
commitcd7a9202a5a6e7712df2b80ed5ebd7b078130fc3 (patch)
treec7e2504dd6de0d2412815dce658468f7add77173 /drivers/input
parent4da9f131a74d12de56c44da6d522a9116da06805 (diff)
downloadlinux-cd7a9202a5a6e7712df2b80ed5ebd7b078130fc3.tar.xz
[PARISC] Fix double free when removing HIL drivers
On Thu, Mar 30, 2006 at 08:31:02AM -0500, Dmitry Torokhov wrote: > Don't do that, its double free. input_unregister_device() normally > causes release() to be called and free the device. input_free_device > is only to be called when input_register_device has not been called or > failed. > > Plus you might want to unregister device after closing serio port, > otherwise your interrupt routine might be referencing already freed > memory. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/hil_kbd.c3
-rw-r--r--drivers/input/keyboard/hilkbd.c1
-rw-r--r--drivers/input/mouse/hil_ptr.c3
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 99f8c5b4cd50..63f387e4b783 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -240,9 +240,8 @@ static void hil_kbd_disconnect(struct serio *serio)
return;
}
- input_unregister_device(kbd->dev);
serio_close(serio);
- input_free_device(kbd->dev);
+ input_unregister_device(kbd->dev);
kfree(kbd);
}
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 452c5f3e6129..33edd030aa75 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -334,7 +334,6 @@ static void __exit hil_exit(void)
input_unregister_device(hil_dev.dev);
- input_free_device(hil_dev.dev);
hil_dev.dev = NULL;
#if defined(CONFIG_PARISC)
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index a648f9fe3d95..bfb564fd8fe2 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -233,9 +233,8 @@ static void hil_ptr_disconnect(struct serio *serio)
return;
}
- input_unregister_device(ptr->dev);
serio_close(serio);
- input_free_device(ptr->dev);
+ input_unregister_device(ptr->dev);
kfree(ptr);
}