Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1879db4f authored by Hongyu Xie's avatar Hongyu Xie Committed by Greg Kroah-Hartman
Browse files

xhci: Prevent futile URB re-submissions due to incorrect return value. 



commit 243a1dd7ba48c120986dd9e66fee74bcb7751034 upstream.

The -ENODEV return value from xhci_check_args() is incorrectly changed
to -EINVAL in a couple places before propagated further.

xhci_check_args() returns 4 types of value, -ENODEV, -EINVAL, 1 and 0.
xhci_urb_enqueue and xhci_check_streams_endpoint return -EINVAL if
the return value of xhci_check_args <= 0.
This causes problems for example r8152_submit_rx, calling usb_submit_urb
in drivers/net/usb/r8152.c.
r8152_submit_rx will never get -ENODEV after submiting an urb when xHC
is halted because xhci_urb_enqueue returns -EINVAL in the very beginning.

[commit message and header edit -Mathias]

Fixes: 203a8661 ("xhci: Avoid NULL pointer deref when host dies.")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHongyu Xie <xiehongyu1@kylinos.cn>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20220215123320.1253947-3-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80922d7b

drivers/usb/host/xhci.c

+6 −3
Original line number Diff line number Diff line
@@ -1487,9 +1487,12 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag 
	struct urb_priv	*urb_priv;

	int num_tds;



	if (!urb || xhci_check_args(hcd, urb->dev, urb->ep,

					true, true, __func__) <= 0)

	if (!urb)

		return -EINVAL;

	ret = xhci_check_args(hcd, urb->dev, urb->ep,

					true, true, __func__);

	if (ret <= 0)

		return ret ? ret : -EINVAL;



	slot_id = urb->dev->slot_id;

	ep_index = xhci_get_endpoint_index(&urb->ep->desc);
@@ -3289,7 +3292,7 @@ static int xhci_check_streams_endpoint(struct xhci_hcd *xhci, 
		return -EINVAL;

	ret = xhci_check_args(xhci_to_hcd(xhci), udev, ep, 1, true, __func__);

	if (ret <= 0)

		return -EINVAL;

		return ret ? ret : -EINVAL;

	if (usb_ss_max_streams(&ep->ss_ep_comp) == 0) {

		xhci_warn(xhci, "WARN: SuperSpeed Endpoint Companion"

				" descriptor for ep 0x%x does not support streams\n",