diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 15:42:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 09:39:37 -0700 |
| commit | a997448c89905b80aa4022f734f03685e733d711 (patch) | |
| tree | 2a672dee7be30a63ed74b549c9a0a188e3ecc763 | |
| parent | 3eb55cc4ed88eee3b5230f66abcdbd2a91639eda (diff) | |
| download | linux-3.10-a997448c89905b80aa4022f734f03685e733d711.tar.gz linux-3.10-a997448c89905b80aa4022f734f03685e733d711.tar.bz2 linux-3.10-a997448c89905b80aa4022f734f03685e733d711.zip | |
USB: ipw: fix interface-data memory leak in error path
Move interface data allocation to attach so that it is deallocated
should usb-serial probe fail.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/ipw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index add45b7d8aa..4264821a3b3 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c @@ -203,8 +203,7 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port) return 0; } -/* fake probe - only to allocate data structures */ -static int ipw_probe(struct usb_serial *serial, const struct usb_device_id *id) +static int ipw_attach(struct usb_serial *serial) { struct usb_wwan_intf_private *data; @@ -303,7 +302,7 @@ static struct usb_serial_driver ipw_device = { .num_ports = 1, .open = ipw_open, .close = ipw_close, - .probe = ipw_probe, + .attach = ipw_attach, .release = ipw_release, .port_probe = usb_wwan_port_probe, .port_remove = usb_wwan_port_remove, |