summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wulff <Chris.Wulff@biamp.com>2024-04-23 20:02:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-24 01:26:10 +0200
commit0aea736ddb877b93f6d2dd8cf439840d6b4970a9 (patch)
tree697405c95454f89c349e62bc593c2de82243f76c
parentUSB: core: Fix access violation during port device removal (diff)
downloadlinux-0aea736ddb877b93f6d2dd8cf439840d6b4970a9.tar.xz
linux-0aea736ddb877b93f6d2dd8cf439840d6b4970a9.zip
usb: gadget: f_fs: Fix a race condition when processing setup packets.
If the USB driver passes a pointer into the TRB buffer for creq, this buffer can be overwritten with the status response as soon as the event is queued. This can make the final check return USB_GADGET_DELAYED_STATUS when it shouldn't. Instead use the stored wLength. Fixes: 4d644abf2569 ("usb: gadget: f_fs: Only return delayed status when len is 0") Cc: stable <stable@kernel.org> Signed-off-by: Chris Wulff <chris.wulff@biamp.com> Link: https://lore.kernel.org/r/CO1PR17MB5419BD664264A558B2395E28E1112@CO1PR17MB5419.namprd17.prod.outlook.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/function/f_fs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index aa80c2a6b8e0..a057cbedf3c9 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3811,7 +3811,7 @@ static int ffs_func_setup(struct usb_function *f,
__ffs_event_add(ffs, FUNCTIONFS_SETUP);
spin_unlock_irqrestore(&ffs->ev.waitq.lock, flags);
- return creq->wLength == 0 ? USB_GADGET_DELAYED_STATUS : 0;
+ return ffs->ev.setup.wLength == 0 ? USB_GADGET_DELAYED_STATUS : 0;
}
static bool ffs_func_req_match(struct usb_function *f,