xhci: Avoid infinite loop when sg urb requires too many trbs
authorBen Hutchings <ben@decadent.org.uk>
Mon, 6 Jan 2014 03:16:32 +0000 (03:16 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Feb 2014 19:22:17 +0000 (11:22 -0800)
commitc7104ed26ac349d1ed2e7d9b8716100823477ab4
tree558f7da644a7c5ed02442c7c36851ec871b6889f
parent9c7d51ca3d6acdcd3fa0aff2e6f6a7bdfb8e2d85
xhci: Avoid infinite loop when sg urb requires too many trbs

commit d6c9ea9069af684358efedcaf2f2f687f51c58ee upstream.

Currently prepare_ring() returns -ENOMEM if the urb won't fit into a
single ring segment.  usb_sg_wait() treats this error as a temporary
condition and will keep retrying until something else goes wrong.

The number of retries should be limited in usb_sg_wait(), but also
prepare_ring() should not return an error code that suggests it might
be worth retrying.  Change it to -EINVAL.

Reported-by: jidanni@jidanni.org
References: http://bugs.debian.org/733907
Fixes: 35773dac5f86 ('usb: xhci: Link TRB must not occur within a USB payload burst')
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-ring.c