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

This commit is contained in:
Linux Build Service Account 2017-03-09 02:04:58 -08:00 committed by Gerrit - the friendly Code Review server
commit c7692d37b0

View file

@ -1879,8 +1879,8 @@ static int ffs_epfiles_create(struct ffs_data *ffs)
ffs->epfiles = epfiles; ffs->epfiles = epfiles;
ffs_log("exit: epfile name %s state %d setup_state %d flag %lu", ffs_log("exit: eps_count %u state %d setup_state %d flag %lu",
epfile->name, ffs->state, ffs->setup_state, ffs->flags); count, ffs->state, ffs->setup_state, ffs->flags);
return 0; return 0;
} }
@ -1891,7 +1891,7 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count)
ENTER(); ENTER();
ffs_log("enter: epfilename %s", epfile->name); ffs_log("enter: count %u", count);
for (; count; --count, ++epfile) { for (; count; --count, ++epfile) {
BUG_ON(mutex_is_locked(&epfile->mutex) || BUG_ON(mutex_is_locked(&epfile->mutex) ||