redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags 

ffs_aio_cancel() can be called from both interrupt and thread context. Make
sure that the current IRQ state is saved and restored by using
spin_{un,}lock_irq{save,restore}().

Otherwise undefined behavior might occur.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
(cherry picked from commit 43d565727a)
5.4-rM2-2.2.x-imx-squashed
Lars-Peter Clausen 2020-01-16 15:29:01 +02:00 committed by Li Jun
parent 5d2a514cac
commit 0892d67aa9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/gadget/function/f_fs.c
View File

@ -1162,18 +1162,19 @@ static int ffs_aio_cancel(struct kiocb *kiocb)
{
struct ffs_io_data *io_data = kiocb->private;
struct ffs_epfile *epfile = kiocb->ki_filp->private_data;
unsigned long flags;
int value;
ENTER();
spin_lock_irq(&epfile->ffs->eps_lock);
spin_lock_irqsave(&epfile->ffs->eps_lock, flags);
if (likely(io_data && io_data->ep && io_data->req))
value = usb_ep_dequeue(io_data->ep, io_data->req);
else
value = -EINVAL;
spin_unlock_irq(&epfile->ffs->eps_lock);
spin_unlock_irqrestore(&epfile->ffs->eps_lock, flags);
return value;
}