Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0015f915 authored by Dan Carpenter's avatar Dan Carpenter Committed by Felipe Balbi
Browse files

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



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>
parent 4879efb3

drivers/usb/gadget/function/f_fs.c

+4 −6
Original line number Diff line number Diff line
@@ -2729,6 +2729,7 @@ static int _ffs_func_bind(struct usb_configuration *c, 
		func->ffs->ss_descs_count;



	int fs_len, hs_len, ss_len, ret, i;

	struct ffs_ep *eps_ptr;



	/* Make it a single chunk, less management later on */

	vla_group(d);
@@ -2777,12 +2778,9 @@ static int _ffs_func_bind(struct usb_configuration *c, 
	       ffs->raw_descs_length);



	memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz);

	for (ret = ffs->eps_count; ret; --ret) {

		struct ffs_ep *ptr;



		ptr = vla_ptr(vlabuf, d, eps);

		ptr[ret].num = -1;

	}

	eps_ptr = vla_ptr(vlabuf, d, eps);

	for (i = 0; i < ffs->eps_count; i++)

		eps_ptr[i].num = -1;



	/* Save pointers

	 * d_eps == vlabuf, func->eps used to kfree vlabuf later