Commit f1d79928 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

usb: f_fs: off by one bug in _ffs_func_bind()

commit 0015f915 upstream.

This loop is supposed to set all the .num[] values to -1 but it's off by
one so it skips the first element and sets one element past the end of
the array.

I've cleaned up the loop a little as well.

Fixes: ddf8abd2 ('USB: f_fs: the FunctionFS driver')
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbd7cf3d
...@@ -2740,6 +2740,7 @@ static int _ffs_func_bind(struct usb_configuration *c, ...@@ -2740,6 +2740,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
func->ffs->ss_descs_count; func->ffs->ss_descs_count;
int fs_len, hs_len, ss_len, ret, i; int fs_len, hs_len, ss_len, ret, i;
struct ffs_ep *eps_ptr;
/* Make it a single chunk, less management later on */ /* Make it a single chunk, less management later on */
vla_group(d); vla_group(d);
...@@ -2788,12 +2789,9 @@ static int _ffs_func_bind(struct usb_configuration *c, ...@@ -2788,12 +2789,9 @@ static int _ffs_func_bind(struct usb_configuration *c,
ffs->raw_descs_length); ffs->raw_descs_length);
memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz); memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz);
for (ret = ffs->eps_count; ret; --ret) { eps_ptr = vla_ptr(vlabuf, d, eps);
struct ffs_ep *ptr; for (i = 0; i < ffs->eps_count; i++)
eps_ptr[i].num = -1;
ptr = vla_ptr(vlabuf, d, eps);
ptr[ret].num = -1;
}
/* Save pointers /* Save pointers
* d_eps == vlabuf, func->eps used to kfree vlabuf later * d_eps == vlabuf, func->eps used to kfree vlabuf later
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment