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

Commit 7087fea5 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: f_fs: Fix out-of-bounds string access" into msm-4.9

parents b0299bd7 bdf16ea9

drivers/usb/gadget/function/f_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -2054,8 +2054,8 @@ static int ffs_epfiles_create(struct ffs_data *ffs) 


	ffs->epfiles = epfiles;



	ffs_log("exit: epfile name %s state %d setup_state %d flag %lu",

		epfile->name, ffs->state, ffs->setup_state, ffs->flags);

	ffs_log("exit: eps_count %u state %d setup_state %d flag %lu",

		count, ffs->state, ffs->setup_state, ffs->flags);



	return 0;

}
@@ -2066,7 +2066,7 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count) 


	ENTER();



	ffs_log("enter: epfilename %s", epfile->name);

	ffs_log("enter: count %u", count);



	for (; count; --count, ++epfile) {

		BUG_ON(mutex_is_locked(&epfile->mutex) ||