[PATCH v2] USB: gadget: f_fs: fix error handling

From: Robert Baldyga
Date: Mon Sep 30 2013 - 05:42:16 EST


Hello,

This is update for my patch fixing error handling in functionfs module.
I have fixed typos from previous version, and changed description for greater
clearity as Sergei Shtylyov suggested.

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 to dereference incorrect pointer.

Signed-off-by: Robert Baldyga <r.baldyga@xxxxxxxxxxx>

Changelog:

v2:
- fix typos
- expand patch desctiprion

v1: https://lkml.org/lkml/2013/9/27/128
---
drivers/usb/gadget/f_fs.c | 2 ++
1 file changed, 2 insertions(+)

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;
}

/*
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/