diff options
| author | Suwan Kim <suwan.kim027@gmail.com> | 2019-12-13 11:30:54 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-31 16:36:21 +0100 |
| commit | 6aba5758c40068be17a672d623567cd6290354e8 (patch) | |
| tree | 5611c6e754684f3aba95a70eb70eb7b1fffe226a | |
| parent | c01601611800d08f80c1f70f2904fdf30520167c (diff) | |
| download | linux-stable-6aba5758c40068be17a672d623567cd6290354e8.tar.gz linux-stable-6aba5758c40068be17a672d623567cd6290354e8.tar.bz2 linux-stable-6aba5758c40068be17a672d623567cd6290354e8.zip | |
usbip: Fix receive error in vhci-hcd when using scatter-gather
commit d986294ee55d719562b20aabe15a39bf8f863415 upstream.
When vhci uses SG and receives data whose size is smaller than SG
buffer size, it tries to receive more data even if it acutally
receives all the data from the server. If then, it erroneously adds
error event and triggers connection shutdown.
vhci-hcd should check if it received all the data even if there are
more SG entries left. So, check if it receivces all the data from
the server in for_each_sg() loop.
Fixes: ea44d190764b ("usbip: Implement SG support to vhci-hcd and stub driver")
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20191213023055.19933-2-suwan.kim027@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/usbip/usbip_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c index d88a5b15f073..88eaf3c45dd5 100644 --- a/drivers/usb/usbip/usbip_common.c +++ b/drivers/usb/usbip/usbip_common.c @@ -727,6 +727,9 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb) copy -= recv; ret += recv; + + if (!copy) + break; } if (ret != size) |