Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd7a9202 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[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: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 4da9f131

drivers/input/keyboard/hil_kbd.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/input/keyboard/hilkbd.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/input/mouse/hil_ptr.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}