Bläddra i källkod

Input: psmouse - fix potential memory leak in psmouse_connect()

If we successfully call input_register_device() in psmouse_connect()
but sysfs_create_group() fails, we'll enter the error path without
ever having called input_unregister_device() potentially leaking
memory.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Andres Salomon 17 år sedan
förälder
incheckning
746b31a9d4
1 ändrade filer med 2 tillägg och 0 borttagningar
  1. 2 0
      drivers/input/mouse/psmouse-base.c

+ 2 - 0
drivers/input/mouse/psmouse-base.c

@@ -1247,6 +1247,8 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
  err_pt_deactivate:
  err_pt_deactivate:
 	if (parent && parent->pt_deactivate)
 	if (parent && parent->pt_deactivate)
 		parent->pt_deactivate(parent);
 		parent->pt_deactivate(parent);
+	input_unregister_device(psmouse->dev);
+	input_dev = NULL; /* so we don't try to free it below */
  err_protocol_disconnect:
  err_protocol_disconnect:
 	if (psmouse->disconnect)
 	if (psmouse->disconnect)
 		psmouse->disconnect(psmouse);
 		psmouse->disconnect(psmouse);