summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2019-11-21 11:37:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-01 09:14:23 +0100
commitd987de580cecd4f37891460c59a2e940c238b8d2 (patch)
tree2e5e15f81202a055158a144eb4e972d147697007 /drivers/nfc
parent96b59fd4c7f5ca1d3c6238a11a29ddb0e98e4531 (diff)
downloadlinux-stable-d987de580cecd4f37891460c59a2e940c238b8d2.tar.gz
linux-stable-d987de580cecd4f37891460c59a2e940c238b8d2.tar.bz2
linux-stable-d987de580cecd4f37891460c59a2e940c238b8d2.zip
nfc: port100: handle command failure cleanly
commit 5f9f0b11f0816b35867f2cf71e54d95f53f03902 upstream. If starting the transfer of a command suceeds but the transfer for the reply fails, it is not enough to initiate killing the transfer for the command may still be running. You need to wait for the killing to finish before you can reuse URB and buffer. Reported-and-tested-by: syzbot+711468aa5c3a1eabf863@syzkaller.appspotmail.com Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/port100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index bb43cebda9dc..60ae382f50da 100644
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -792,7 +792,7 @@ static int port100_send_frame_async(struct port100 *dev, struct sk_buff *out,
rc = port100_submit_urb_for_ack(dev, GFP_KERNEL);
if (rc)
- usb_unlink_urb(dev->out_urb);
+ usb_kill_urb(dev->out_urb);
exit:
mutex_unlock(&dev->out_urb_lock);