summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUdipto Goswami <quic_ugoswami@quicinc.com>2022-12-15 10:59:06 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-06 07:49:39 +0100
commitbf7ddf96c12beac7058af27fe7ce6e2e499724c5 (patch)
treeda07cc5b1b16e3b4c5710bf505fcba5653d5c56e /drivers
parente9036e951f93fb8d7b5e9d6e2c7f94a4da312ae4 (diff)
downloadlinux-stable-bf7ddf96c12beac7058af27fe7ce6e2e499724c5.tar.gz
linux-stable-bf7ddf96c12beac7058af27fe7ce6e2e499724c5.tar.bz2
linux-stable-bf7ddf96c12beac7058af27fe7ce6e2e499724c5.zip
usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
[ Upstream commit ce405d561b020e5a46340eb5146805a625dcacee ] As per the documentation, function usb_ep_free_request guarantees the request will not be queued or no longer be re-queued (or otherwise used). However, with the current implementation it doesn't make sure that the request in ep0 isn't reused. Fix this by dequeuing the ep0req on functionfs_unbind before freeing the request to align with the definition. Fixes: ddf8abd25994 ("USB: f_fs: the FunctionFS driver") Signed-off-by: Udipto Goswami <quic_ugoswami@quicinc.com> Tested-by: Krishna Kurapati <quic_kriskura@quicinc.com> Link: https://lore.kernel.org/r/20221215052906.8993-3-quic_ugoswami@quicinc.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/function/f_fs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index b3489a3449f6..48bdb2a3972b 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1810,6 +1810,8 @@ static void functionfs_unbind(struct ffs_data *ffs)
ENTER();
if (!WARN_ON(!ffs->gadget)) {
+ /* dequeue before freeing ep0req */
+ usb_ep_dequeue(ffs->gadget->ep0, ffs->ep0req);
mutex_lock(&ffs->mutex);
usb_ep_free_request(ffs->gadget->ep0, ffs->ep0req);
ffs->ep0req = NULL;