projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b2b093
)
USB: mxu11x0: fix memory leak in port-probe error path
author
Johan Hovold
<johan@kernel.org>
Tue, 29 Dec 2015 12:36:11 +0000
(13:36 +0100)
committer
Johan Hovold
<johan@kernel.org>
Tue, 29 Dec 2015 12:43:13 +0000
(13:43 +0100)
Fix memory leak in port-probe error path by verifying the interrupt-in
urb before allocating the private data.
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/mxu11x0.c
patch
|
blob
|
history
diff --git
a/drivers/usb/serial/mxu11x0.c
b/drivers/usb/serial/mxu11x0.c
index 8884ca276e672fe9aef089c26d29d3e1bf23b3ed..89426c3eba989f58410b546219390dbd2ae03732 100644
(file)
--- a/
drivers/usb/serial/mxu11x0.c
+++ b/
drivers/usb/serial/mxu11x0.c
@@
-333,7
+333,11
@@
static int mxu1_port_probe(struct usb_serial_port *port)
{
struct mxu1_port *mxport;
struct mxu1_device *mxdev;
- struct urb *urb;
+
+ if (!port->interrupt_in_urb) {
+ dev_err(&port->dev, "no interrupt urb\n");
+ return -ENODEV;
+ }
mxport = kzalloc(sizeof(struct mxu1_port), GFP_KERNEL);
if (!mxport)
@@
-344,12
+348,6
@@
static int mxu1_port_probe(struct usb_serial_port *port)
mxdev = usb_get_serial_data(port->serial);
- urb = port->interrupt_in_urb;
- if (!urb) {
- dev_err(&port->dev, "%s - no interrupt urb\n", __func__);
- return -EINVAL;
- }
-
switch (mxdev->mxd_model) {
case MXU1_1110_PRODUCT_ID:
case MXU1_1150_PRODUCT_ID: