]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: gadget: f_fs: fix error handling
authorRobert Baldyga <r.baldyga@samsung.com>
Fri, 27 Sep 2013 10:28:54 +0000 (12:28 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 1 Oct 2013 14:04:22 +0000 (09:04 -0500)
This patch add missing error check in ffs_func_bind() function, after
ffs_do_descs() function call for high speed descriptors. Without this
check it's possible that the module will try dereference incorrect
pointer.

[ balbi@ti.com : removed trailing empty line ]

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/f_fs.c

index 1a66c5baa0d1f292188a1756cf17d5243b2ffe58..0da66bacb0d434df93ade7aa425aa448d7fdf21a 100644 (file)
@@ -2264,6 +2264,8 @@ static int ffs_func_bind(struct usb_configuration *c,
                                   data->raw_descs + ret,
                                   (sizeof data->raw_descs) - ret,
                                   __ffs_func_bind_do_descs, func);
+               if (unlikely(ret < 0))
+                       goto error;
        }
 
        /*