Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 12 Dec 2019 12:45:40 +0100
From:   Marek =?utf-8?Q?Marczykowski-G=C3=B3recki?= 
        <marmarek@invisiblethingslab.com>
To:     Suwan Kim <suwan.kim027@gmail.com>
Cc:     shuah@kernel.org, valentina.manea.m@gmail.com,
        gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 2/2] usbip: Fix error path of vhci_recv_ret_submit()
Message-ID: <20191212114540.GV11116@mail-itl>
References: <20191212052841.6734-1-suwan.kim027@gmail.com>
 <20191212052841.6734-3-suwan.kim027@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="CMEQapY8OuP5ao1l"
Content-Disposition: inline
In-Reply-To: <20191212052841.6734-3-suwan.kim027@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--CMEQapY8OuP5ao1l
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PATCH 2/2] usbip: Fix error path of vhci_recv_ret_submit()

On Thu, Dec 12, 2019 at 02:28:41PM +0900, Suwan Kim wrote:
> If a transaction error happens in vhci_recv_ret_submit(), event
> handler closes connection and changes port status to kick hub_event.
> Then hub tries to flush the endpoint URBs, but that causes infinite
> loop between usb_hub_flush_endpoint() and vhci_urb_dequeue() because
> "vhci_priv" in vhci_urb_dequeue() was already released by
> vhci_recv_ret_submit() before a transmission error occurred. Thus,
> vhci_urb_dequeue() terminates early and usb_hub_flush_endpoint()
> continuously calls vhci_urb_dequeue().
>=20
> The root cause of this issue is that vhci_recv_ret_submit()
> terminates early without giving back URB when transaction error
> occurs in vhci_recv_ret_submit(). That causes the error URB to still
> be linked at endpoint list without =E2=80=9Cvhci_priv".
>=20
> So, in the case of trasnaction error in vhci_recv_ret_submit(),
                       ^^^ typo

> unlink URB from the endpoint, insert proper error code in
> urb->status and give back URB.
>=20
> Reported-by: Marek Marczykowski-G=C3=B3recki <marmarek@invisiblethingslab=
=2Ecom>
> Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>

Tested-by: Marek Marczykowski-G=C3=B3recki <marmarek@invisiblethingslab.com>

> ---
>  drivers/usb/usbip/vhci_rx.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
> index 33f8972ba842..dc26acad6baf 100644
> --- a/drivers/usb/usbip/vhci_rx.c
> +++ b/drivers/usb/usbip/vhci_rx.c
> @@ -77,16 +77,21 @@ static void vhci_recv_ret_submit(struct vhci_device *=
vdev,
>  	usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);
> =20
>  	/* recv transfer buffer */
> -	if (usbip_recv_xbuff(ud, urb) < 0)
> -		return;
> +	if (usbip_recv_xbuff(ud, urb) < 0) {
> +		urb->status =3D -EPIPE;
> +		goto error;
> +	}
> =20
>  	/* recv iso_packet_descriptor */
> -	if (usbip_recv_iso(ud, urb) < 0)
> -		return;
> +	if (usbip_recv_iso(ud, urb) < 0) {
> +		urb->status =3D -EPIPE;
> +		goto error;
> +	}
> =20
>  	/* restore the padding in iso packets */
>  	usbip_pad_iso(ud, urb);
> =20
> +error:
>  	if (usbip_dbg_flag_vhci_rx)
>  		usbip_dump_urb(urb);
> =20

--=20
Best Regards,
Marek Marczykowski-G=C3=B3recki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?

--CMEQapY8OuP5ao1l
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEhrpukzGPukRmQqkK24/THMrX1ywFAl3yKGQACgkQ24/THMrX
1yyGhwf6Ao9XCbDr3/5+tsoBrYZRGAUiFToowB3TYnozElhzWd6C324buzzhKOAI
qQOTLtxe75OamWTSlJgdzPscrPL2e2vmu5zvmJm0qdWaW3+5wOT8SqLt0eXhpLx/
PF9Yyw/cUaXWSlYNZVcYtVC1BaY0Qrnzcb/Pwb90N8QtbUVIexDMZqyJQf9TCxx0
7QppyGr1tA+jT2vtJEEjVpRG978vd4Ma2aNMod3E34pjzGJJ+2p+igdZ9NrIKMwj
+BFIKqLXjsmby0WJskDGFQcVqH8Yw116BshrAiSxNcrrviqonGrif41KcqWG54eQ
m8UwtNUUAleiStYns1hb0D1OoQjXTA==
=+pPz
-----END PGP SIGNATURE-----

--CMEQapY8OuP5ao1l--