lkml.org 
[lkml]   [2022]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v3 3/3] staging: rtl8712: add error handler in r8712_usbctrl_vendorreq()
From
Hi Wang,

On 5/6/22 15:01, Wang Cheng wrote:
> When 'status' returned from usb_control_msg() is not equal to 'len',
> that usb_control_msg() is on partial failure, r8712_usbctrl_vendorreq()
> will treat partial reads as success.
>
> Signed-off-by: Wang Cheng <wanngchenng@gmail.com>
> ---
> drivers/staging/rtl8712/usb_ops_linux.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c
> index f984a5ab2c6f..b2181e1e2d38 100644
> --- a/drivers/staging/rtl8712/usb_ops_linux.c
> +++ b/drivers/staging/rtl8712/usb_ops_linux.c
> @@ -495,14 +495,21 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value,
> }
> status = usb_control_msg(udev, pipe, request, reqtype, value, index,
> pIo_buf, len, 500);
> - if (status > 0) { /* Success this control transfer. */
> - if (requesttype == 0x01) {
> - /* For Control read transfer, we have to copy the read
> - * data from pIo_buf to pdata.
> - */
> - memcpy(pdata, pIo_buf, status);
> - }
> + if (status < 0)
> + goto free;
> + if (status != len) {
> + status = -EREMOTEIO;
> + goto free;
> + }
> + /* Success this control transfer. */
> + if (requesttype == 0x01) {
> + /* For Control read transfer, we have to copy the read
> + * data from pIo_buf to pdata.
> + */
> + memcpy(pdata, pIo_buf, status);
> }
> +
> +free:
> kfree(palloc_buf);
> return status;
> }

Ah, here it is. This patch should be 1st in the series, since 1/3 now
looks buggy.




With regards,
Pavel Skripkin
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-05-06 14:14    [W:0.275 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site