summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2013-09-27 12:28:54 +0200
committerFelipe Balbi <balbi@ti.com>2013-10-01 09:04:22 -0500
commit8854894c040cd68b463dccf267308250b336df40 (patch)
tree856081a87ef56d5aac17b244939a68afe585a6fb
parent4fc4b274f9b3b5f18896a069e5f9f8dd8f0d450a (diff)
downloadop-kernel-dev-8854894c040cd68b463dccf267308250b336df40.zip
op-kernel-dev-8854894c040cd68b463dccf267308250b336df40.tar.gz
usb: gadget: f_fs: fix error handling
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>
-rw-r--r--drivers/usb/gadget/f_fs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 1a66c5b..0da66ba 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -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;
}
/*
OpenPOWER on IntegriCloud