From nobody Sun May 10 09:53:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66783C433F5 for ; Fri, 6 May 2022 11:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391591AbiEFMDc (ORCPT ); Fri, 6 May 2022 08:03:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1385170AbiEFMDb (ORCPT ); Fri, 6 May 2022 08:03:31 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F72D59305 for ; Fri, 6 May 2022 04:59:48 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id l11-20020a17090a49cb00b001d923a9ca99so6679201pjm.1 for ; Fri, 06 May 2022 04:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=GqJiXmf/yR4F5NdPu8U00YuMrcdHySiedhjp2AtvKqY=; b=AXPcpbVvE9CtwugDeEOIv/vX7bF9/PoiIn5DGX/teXTfrMjcjWyeiJkEHipJUfUEKz BRpv6fFaUisXjToCVnHP2HAyES2YfmS6NV7WT/vJ5FwF5jm7n1dNFCKjhLWjcKX2pf9L iSP5Dh+jFr8/dkGxK73TgTysXEQ2xhpePPCyEqzMDXXzIpku6VyRMaE79uJ0ZCz37pqS bkPudPlYYlo+2Nt7A4CNwKmk+1sGHrSSRvsNcGexDTAf5t4gbbts74JDqLqPkImR0Xz7 2vWuM8qKcmWGYAHIkanBC/Pw6nBHmatnSF1TcLiy8orco4VPi+oRbv78jimhp4rMIzRe +wDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GqJiXmf/yR4F5NdPu8U00YuMrcdHySiedhjp2AtvKqY=; b=1nRdTMTAIHg4KzC6+Cy52vT6+1jkOU/+Ys2pB7JOQnQA7AG3Wg9oDKhfoNz6LGEMVf 6tUCaByBpcAu3T8OTJcL/AOAnsIcY9jc2MGJkzVYoLhZP9SC7XTVGLt3xiTkOfNDIVqP 4hzfxmVa69aPZt0j9jHkjUwiab2kI0zqqy8bH/VTBY5TfI89qRKHPY7ZdrEWSviexRcC 4ndfrbSvJtt+G7Oyh+rIuR6LQBi6JdIVdznsmI5P53M6sOOu0eKTim+clVpTWHN16oDx kyw5wyaV0x5BO0PTL5EpPkzGXlYIpKVO4lTvZvOQlEjT3SRA7IU26SfxcC017lzYS2V+ QjIg== X-Gm-Message-State: AOAM533fygb7SHSIGAFZRiUDdwQ7t34AEumA9xZ8yHDs4EwI95FTr+sZ dGJ9t+nAYZgsLJz2J0JAtPY= X-Google-Smtp-Source: ABdhPJz5yQHjfhioE4maKHg7mVcei4mTA2n1AmNlN7k+xCgP+acfvZkoiI/xRrjuKzHHLyyfeIezKg== X-Received: by 2002:a17:90b:610:b0:1d9:4008:cfee with SMTP id gb16-20020a17090b061000b001d94008cfeemr3813211pjb.71.1651838388082; Fri, 06 May 2022 04:59:48 -0700 (PDT) Received: from localhost ([152.70.90.187]) by smtp.gmail.com with ESMTPSA id ck3-20020a17090afe0300b001cd4989feebsm7075501pjb.55.2022.05.06.04.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 04:59:47 -0700 (PDT) Date: Fri, 6 May 2022 19:59:42 +0800 From: Wang Cheng To: dan.carpenter@oracle.com, paskripkin@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] staging: rtl8712: fix uninit-value in usb_read8() and friends Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When r8712_usbctrl_vendorreq() returns negative, 'data' in usb_read{8,16,32} will not be initialized. BUG: KMSAN: uninit-value in string_nocheck lib/vsprintf.c:643 [inline] BUG: KMSAN: uninit-value in string+0x4ec/0x6f0 lib/vsprintf.c:725 string_nocheck lib/vsprintf.c:643 [inline] string+0x4ec/0x6f0 lib/vsprintf.c:725 vsnprintf+0x2222/0x3650 lib/vsprintf.c:2806 va_format lib/vsprintf.c:1704 [inline] pointer+0x18e6/0x1f70 lib/vsprintf.c:2443 vsnprintf+0x1a9b/0x3650 lib/vsprintf.c:2810 vprintk_store+0x537/0x2150 kernel/printk/printk.c:2158 vprintk_emit+0x28b/0xab0 kernel/printk/printk.c:2256 dev_vprintk_emit+0x5ef/0x6d0 drivers/base/core.c:4604 dev_printk_emit+0x1dd/0x21f drivers/base/core.c:4615 __dev_printk+0x3be/0x440 drivers/base/core.c:4627 _dev_info+0x1ea/0x22f drivers/base/core.c:4673 r871xu_drv_init+0x1929/0x3070 drivers/staging/rtl8712/usb_intf.c:401 usb_probe_interface+0xf19/0x1600 drivers/usb/core/driver.c:396 really_probe+0x6c7/0x1350 drivers/base/dd.c:621 __driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752 driver_probe_device drivers/base/dd.c:782 [inline] __device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899 bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427 __device_attach+0x593/0x8e0 drivers/base/dd.c:970 device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017 bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487 device_add+0x1fff/0x26e0 drivers/base/core.c:3405 usb_set_configuration+0x37e9/0x3ed0 drivers/usb/core/message.c:2170 usb_generic_driver_probe+0x13c/0x300 drivers/usb/core/generic.c:238 usb_probe_device+0x309/0x570 drivers/usb/core/driver.c:293 really_probe+0x6c7/0x1350 drivers/base/dd.c:621 __driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752 driver_probe_device drivers/base/dd.c:782 [inline] __device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899 bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427 __device_attach+0x593/0x8e0 drivers/base/dd.c:970 device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017 bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487 device_add+0x1fff/0x26e0 drivers/base/core.c:3405 usb_new_device+0x1b91/0x2950 drivers/usb/core/hub.c:2566 hub_port_connect drivers/usb/core/hub.c:5363 [inline] hub_port_connect_change drivers/usb/core/hub.c:5507 [inline] port_event drivers/usb/core/hub.c:5665 [inline] hub_event+0x58e3/0x89e0 drivers/usb/core/hub.c:5747 process_one_work+0xdb6/0x1820 kernel/workqueue.c:2289 worker_thread+0x10d0/0x2240 kernel/workqueue.c:2436 kthread+0x3c7/0x500 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 Local variable data created at: usb_read8+0x5d/0x130 drivers/staging/rtl8712/usb_ops.c:33 r8712_read8+0xa5/0xd0 drivers/staging/rtl8712/rtl8712_io.c:29 Reported-and-tested-by: syzbot+6f5ecd144854c0d8580b@syzkaller.appspotmail.c= om Signed-off-by: Wang Cheng --- drivers/staging/rtl8712/usb_ops.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8712/usb_ops.c b/drivers/staging/rtl8712/us= b_ops.c index e64845e6adf3..af9966d03979 100644 --- a/drivers/staging/rtl8712/usb_ops.c +++ b/drivers/staging/rtl8712/usb_ops.c @@ -29,7 +29,8 @@ static u8 usb_read8(struct intf_hdl *intfhdl, u32 addr) u16 wvalue; u16 index; u16 len; - __le32 data; + int status; + __le32 data =3D 0; struct intf_priv *intfpriv =3D intfhdl->pintfpriv; =20 request =3D 0x05; @@ -37,8 +38,10 @@ static u8 usb_read8(struct intf_hdl *intfhdl, u32 addr) index =3D 0; wvalue =3D (u16)(addr & 0x0000ffff); len =3D 1; - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, - requesttype); + status =3D r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, + &data, len, requesttype); + if (status < 0) + return 0; return (u8)(le32_to_cpu(data) & 0x0ff); } =20 @@ -49,7 +52,8 @@ static u16 usb_read16(struct intf_hdl *intfhdl, u32 addr) u16 wvalue; u16 index; u16 len; - __le32 data; + int status; + __le32 data =3D 0; struct intf_priv *intfpriv =3D intfhdl->pintfpriv; =20 request =3D 0x05; @@ -57,8 +61,10 @@ static u16 usb_read16(struct intf_hdl *intfhdl, u32 addr) index =3D 0; wvalue =3D (u16)(addr & 0x0000ffff); len =3D 2; - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, - requesttype); + status =3D r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, + &data, len, requesttype); + if (status < 0) + return 0; return (u16)(le32_to_cpu(data) & 0xffff); } =20 @@ -69,7 +75,8 @@ static u32 usb_read32(struct intf_hdl *intfhdl, u32 addr) u16 wvalue; u16 index; u16 len; - __le32 data; + int status; + __le32 data =3D 0; struct intf_priv *intfpriv =3D intfhdl->pintfpriv; =20 request =3D 0x05; @@ -77,8 +84,10 @@ static u32 usb_read32(struct intf_hdl *intfhdl, u32 addr) index =3D 0; wvalue =3D (u16)(addr & 0x0000ffff); len =3D 4; - r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, &data, len, - requesttype); + status =3D r8712_usbctrl_vendorreq(intfpriv, request, wvalue, index, + &data, len, requesttype); + if (status < 0) + return 0; return le32_to_cpu(data); } =20 --=20 2.33.1 From nobody Sun May 10 09:53:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1143C433F5 for ; Fri, 6 May 2022 12:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391597AbiEFMDv (ORCPT ); Fri, 6 May 2022 08:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380114AbiEFMDt (ORCPT ); Fri, 6 May 2022 08:03:49 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F04A60DAA for ; Fri, 6 May 2022 05:00:07 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id 15so5936064pgf.4 for ; Fri, 06 May 2022 05:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nLavEAR5Aau9+5bXqJeGR1zfvkVlJijBBWww/pFaBdg=; b=DeEyjUY/AE4zdNZnPtis7a7XGLtDDO3d/lJzBjqrUsP9rcMTrXZBtw+hwaySnho1Fh jrngQRa8MGUKkyTvWSQPHeUWHpai58VlWs0CzkvL9r4rhBQFX+4LJDXxvIm+KxfjQhgj zBBE+TUgiT8YlED78tDChevr6U/iNmpKQq0DzNGtXVe5BnkuFcr+zX30CXxTVGXiq7xi otEGboTuUFFtpY5K3ed8WZ6ncFyMOvcvMfbfqlcVc2+zaGW3YBLDuObRJeBMyWccOxZm GQpR+FSAVBBQJ/AGHPOn+6SDjVlq3cSkkcrbnIAb3bJ5ADvUTxMbethyv1Sti66/oMIy z4dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nLavEAR5Aau9+5bXqJeGR1zfvkVlJijBBWww/pFaBdg=; b=FVwDzcgqRXa8jxoprjZwi/N0Njfnda9eAf86Zq56FTYD8sLwfoaTGPzFl9qdQYYXBH i6h9i9jV5L44f799TaDxFonOnlH1KdhDCqYbS1pq+tnJq67ADPgw8mLbDKKvtm2RQ+b/ MTqfP5OLz9RFB9eZ0AHA9ej3cykXskNdgMfJWU9r29De6IUlAI7H00ac68m8vv9/UYPN S6aZbJmId3wTLaY8IUf4cBn5452vAuL1lXIHO2Vfn3bWsrcE2YnR/GLTkMeqsZ7uwq6x dIen95qHQQqK9HvrXkfRJyEFnvks24tVleRRg9IzYHfFFsFGg/bdu8+ki0Sd4N0ve6OX RHkw== X-Gm-Message-State: AOAM532n9eSxXFdx68epz+AWm9K+b8ixCAjOHB5BGW3MugJO3jz2GFlX 0D/paRA2cyi0DUSL4MAm23Q= X-Google-Smtp-Source: ABdhPJwg4XY20f0zcCWhvaiidVQyvulZHkhF/Z7tytzmQiJbJ12b4Fi553fBIbXUhmdMDZsdj2rzZQ== X-Received: by 2002:a63:8542:0:b0:3ab:4911:ec35 with SMTP id u63-20020a638542000000b003ab4911ec35mr2503523pgd.356.1651838406739; Fri, 06 May 2022 05:00:06 -0700 (PDT) Received: from localhost ([152.70.90.187]) by smtp.gmail.com with ESMTPSA id be12-20020a056a001f0c00b0050dc76281basm3233819pfb.148.2022.05.06.05.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 05:00:06 -0700 (PDT) Date: Fri, 6 May 2022 19:59:59 +0800 From: Wang Cheng To: dan.carpenter@oracle.com, paskripkin@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] staging: rtl8712: fix uninit-value in r871xu_drv_init() Message-ID: <14c3886173dfa4597f0704547c414cfdbcd11d16.1651833575.git.wanngchenng@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When 'tmpU1b' returns from r8712_read8(padapter, EE_9346CR) is 0, 'mac[6]' will not be initialized. BUG: KMSAN: uninit-value in r871xu_drv_init+0x2d54/0x3070 drivers/staging/r= tl8712/usb_intf.c:541 r871xu_drv_init+0x2d54/0x3070 drivers/staging/rtl8712/usb_intf.c:541 usb_probe_interface+0xf19/0x1600 drivers/usb/core/driver.c:396 really_probe+0x653/0x14b0 drivers/base/dd.c:596 __driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752 driver_probe_device drivers/base/dd.c:782 [inline] __device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899 bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427 __device_attach+0x593/0x8e0 drivers/base/dd.c:970 device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017 bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487 device_add+0x1fff/0x26e0 drivers/base/core.c:3405 usb_set_configuration+0x37e9/0x3ed0 drivers/usb/core/message.c:2170 usb_generic_driver_probe+0x13c/0x300 drivers/usb/core/generic.c:238 usb_probe_device+0x309/0x570 drivers/usb/core/driver.c:293 really_probe+0x653/0x14b0 drivers/base/dd.c:596 __driver_probe_device+0x3e9/0x530 drivers/base/dd.c:752 driver_probe_device drivers/base/dd.c:782 [inline] __device_attach_driver+0x79f/0x1120 drivers/base/dd.c:899 bus_for_each_drv+0x2d6/0x3f0 drivers/base/bus.c:427 __device_attach+0x593/0x8e0 drivers/base/dd.c:970 device_initial_probe+0x4a/0x60 drivers/base/dd.c:1017 bus_probe_device+0x17b/0x3e0 drivers/base/bus.c:487 device_add+0x1fff/0x26e0 drivers/base/core.c:3405 usb_new_device+0x1b8e/0x2950 drivers/usb/core/hub.c:2566 hub_port_connect drivers/usb/core/hub.c:5358 [inline] hub_port_connect_change drivers/usb/core/hub.c:5502 [inline] port_event drivers/usb/core/hub.c:5660 [inline] hub_event+0x58e3/0x89e0 drivers/usb/core/hub.c:5742 process_one_work+0xdb6/0x1820 kernel/workqueue.c:2307 worker_thread+0x10b3/0x21e0 kernel/workqueue.c:2454 kthread+0x3c7/0x500 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 Local variable mac created at: r871xu_drv_init+0x1771/0x3070 drivers/staging/rtl8712/usb_intf.c:394 usb_probe_interface+0xf19/0x1600 drivers/usb/core/driver.c:396 Reported-and-tested-by: syzbot+6f5ecd144854c0d8580b@syzkaller.appspotmail.c= om Signed-off-by: Wang Cheng --- drivers/staging/rtl8712/usb_intf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/u= sb_intf.c index ee4c61f85a07..50dcd3ecb685 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -538,13 +538,13 @@ static int r871xu_drv_init(struct usb_interface *pusb= _intf, } else { AutoloadFail =3D false; } - if (((mac[0] =3D=3D 0xff) && (mac[1] =3D=3D 0xff) && + if ((!AutoloadFail) || + ((mac[0] =3D=3D 0xff) && (mac[1] =3D=3D 0xff) && (mac[2] =3D=3D 0xff) && (mac[3] =3D=3D 0xff) && (mac[4] =3D=3D 0xff) && (mac[5] =3D=3D 0xff)) || ((mac[0] =3D=3D 0x00) && (mac[1] =3D=3D 0x00) && (mac[2] =3D=3D 0x00) && (mac[3] =3D=3D 0x00) && - (mac[4] =3D=3D 0x00) && (mac[5] =3D=3D 0x00)) || - (!AutoloadFail)) { + (mac[4] =3D=3D 0x00) && (mac[5] =3D=3D 0x00))) { mac[0] =3D 0x00; mac[1] =3D 0xe0; mac[2] =3D 0x4c; --=20 2.33.1 From nobody Sun May 10 09:53:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19EA0C433EF for ; Fri, 6 May 2022 12:01:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391606AbiEFMFf (ORCPT ); Fri, 6 May 2022 08:05:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238738AbiEFMFe (ORCPT ); Fri, 6 May 2022 08:05:34 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8945D1D30F for ; Fri, 6 May 2022 05:01:51 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id i17so7183395pla.10 for ; Fri, 06 May 2022 05:01:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=i9PJvhEX8P9EwLto+E+6JAbwn0v8MnYujSttxKDDDe0=; b=lksT/n19/JYsn93CnYdttA/s6P7bMZJpP+Ms209BI2CObc+AMkQUlT6IubqMu1Mahp O8nRm01qDnsw8e1hE+kYJW6jLabXrejT8hGuB9BWDMm+x1QX9rmAulxyWM3O047U6X4t mjDRY4NnhMooqkdMRULWbQnVaHGlvSF+wooVC1frMAzJ9ou4UQ4uEKtdG36GKAptCFEx KLcwmJcoNIN4rbNWlMJLTbSB+zINy9WGFSEpYjnAk2dODhQCljiii+pFFgAMINIIrbam Bhly8p9NLnSHX1pA8yHLAppMyHH49XGBRqxTfYZr58rLfLH7/gyW3BRRH6N2/ok4VFAw XPxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=i9PJvhEX8P9EwLto+E+6JAbwn0v8MnYujSttxKDDDe0=; b=qCqpX130Zzs1n4NXamfkQ5Z78gAub09/MBSxVcwl70vCqjOpXlu8RvmO0+hpG6ozxT i/o1za2dkgHT0kExU91gNxaRIfwiBbnpU3TU3Dv2UPyXDK44ZGMESa9j++oM64n0TrKZ B5MdZ74sGtGa1ZViPbR7fSi8EvgOL1giLleqKDdNc8avLsOaA+1q2TYJsg/sGdJWxyyZ zmqUaNEq8nGEC25rvK41MBtqt/P8tSSS7WNVgwg1j6byLqUbMxUvxF8HgqU+bH26fTE8 8/3aLgSyEABSbHZG7IIc1l8wwXxnuJZl5C/nHMzFemSf7iR6146yGtwFTcjZR/lvXnU1 dwoQ== X-Gm-Message-State: AOAM532tbXk5ov68t+l60BC09VG7cklnwR4ZdttBmKEHi1K/P/7AUGA4 BjyqUs2pnTBKwRJsB64qQONclqo2HIw= X-Google-Smtp-Source: ABdhPJwdf1n78F/MCPW8uBDH56G1BwkHvo3AmYJjlhLXlgtLLi3HlnNHA2E1gJPWALUl/vmWJMJpSg== X-Received: by 2002:a17:902:e808:b0:15e:b27b:9302 with SMTP id u8-20020a170902e80800b0015eb27b9302mr3326522plg.54.1651838511019; Fri, 06 May 2022 05:01:51 -0700 (PDT) Received: from localhost ([152.70.90.187]) by smtp.gmail.com with ESMTPSA id q27-20020a056a0002bb00b0050dc76281ebsm3169785pfs.197.2022.05.06.05.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 05:01:50 -0700 (PDT) Date: Fri, 6 May 2022 20:01:44 +0800 From: Wang Cheng To: dan.carpenter@oracle.com, paskripkin@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] staging: rtl8712: add error handler in r8712_usbctrl_vendorreq() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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/rtl8= 712/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 *pintfpr= iv, u8 request, u16 value, } status =3D usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, 500); - if (status > 0) { /* Success this control transfer. */ - if (requesttype =3D=3D 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 !=3D len) { + status =3D -EREMOTEIO; + goto free; + } + /* Success this control transfer. */ + if (requesttype =3D=3D 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; } --=20 2.33.1