Commit a112adaf authored Jan 13, 2020 by Johan Hovold Committed by Jakub Kicinski Jan 13, 2020

NFC: pn533: fix bulk-message timeout

The driver was doing a synchronous uninterruptible bulk-transfer without
using a timeout. This could lead to the driver hanging on probe due to a
malfunctioning (or malicious) device until the device is physically
disconnected. While sleeping in probe the driver prevents other devices
connected to the same hub from being added to (or removed from) the bus.

An arbitrary limit of five seconds should be more than enough.

Fixes: dbafc289 ("NFC: pn533: don't send USB data off of the stack")
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent a9ff44f0

drivers/nfc/pn533/usb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -391,7 +391,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy)
		cmd, sizeof(cmd), false);

		rc = usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd),
		&transferred, 0);
		&transferred, 5000);
		kfree(buffer);
		if (rc \|\| (transferred != sizeof(cmd))) {
		nfc_err(&phy->udev->dev,

Admin message