From: Andres Salomon Date: Thu, 17 Jan 2008 17:01:30 +0000 (-0500) Subject: Input: psmouse - fix potential memory leak in psmouse_connect() X-Git-Tag: v2.6.24~45^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=746b31a9d4e08240d267069bcf5084eb7e427ad7;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 21a9c0b69a1..b8628252e10 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1247,6 +1247,8 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv) err_pt_deactivate: if (parent && parent->pt_deactivate) parent->pt_deactivate(parent); + input_unregister_device(psmouse->dev); + input_dev = NULL; /* so we don't try to free it below */ err_protocol_disconnect: if (psmouse->disconnect) psmouse->disconnect(psmouse);