Message ID | 20230309021636.528601-1-dzm91@hust.edu.cn |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp52214wrd; Wed, 8 Mar 2023 18:31:22 -0800 (PST) X-Google-Smtp-Source: AK7set/3c11vqebXiQ6y06RM9Pe04I6z7kqUMlN8qzqZvzNhxc3KcsRzzeIB1KK54pMST/4Milrz X-Received: by 2002:a17:902:d489:b0:19e:5cc3:828f with SMTP id c9-20020a170902d48900b0019e5cc3828fmr25072854plg.27.1678329082547; Wed, 08 Mar 2023 18:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678329082; cv=none; d=google.com; s=arc-20160816; b=w5sMdqirORBW5rM8ilVvciysesl7AzHqxouD9RPlIlcEvI7Mzdrm2WoalquOuXo/i8 MCReI3WLFsGhr1eer0D8jvWW34JJOrPcSAkPOqbnj4Wox0WS4k0Lq9jP0p0hFfL5XQHb r4Cg22BZ/NXCfUiucD16pXJoja63XbwE+jqDbxuuNV6o5ZtRp/Fh2SrCcBpgH9xtPcaH OxZ3kIMFBR+f6X9ARSXyvO3BGt+0ATuc5t+cW4Cn3zHtx7XoWytMQ/QbHWZ0Dpxywcyc J9rLWKA/I+4yCy/B79yVx3l1MtLVcOq2os6D2cKicNuRpI0bzMjy4qPlIxar1C0gGKrK 6A1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=V7kYEyRk+H+mweCKHfuzVMwdp+Ozk49GbLAFciawGjU=; b=GfglhFZfXO2ziadQlMTOzQxLeOm1buXCi7t1m6ZxgHAMGPNFJxiuvtEzPetnk2eKO0 +bttY5KiyH7e5Yt0bw6EBCen4uqOtQ85ffTsPHVvsucSfappf0BmcJ4CdHyir3zVRJMC CUIghkw5H3eVn5H4JibfkFEgOfvjBwVNGoq59nuet4FZWE0ELe61274CLa6mcsp/FlgX B1MabYPREjFiRt6VjHEnMLksFjdRi6LY8hwWRxQR4W6fuyALF/cj8vGJUNjywr3MeNlJ B4Q/BVdb/f7bP0KXuDGg2+fKvVHcM79rv7YxHX1MhoprFBW3yHFnGQLlOF+MBNPoVwwY a3mA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kl15-20020a170903074f00b0019abdf99d41si9723440plb.157.2023.03.08.18.31.09; Wed, 08 Mar 2023 18:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230007AbjCICTw (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Wed, 8 Mar 2023 21:19:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230037AbjCICTu (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 8 Mar 2023 21:19:50 -0500 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0388FC5AE9; Wed, 8 Mar 2023 18:19:48 -0800 (PST) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 3292JBih021312-3292JBik021312 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Mar 2023 10:19:16 +0800 From: Dongliang Mu <dzm91@hust.edu.cn> To: Yan-Hsuan Chuang <tony0620emma@gmail.com>, Kalle Valo <kvalo@kernel.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: Dongliang Mu <dzm91@hust.edu.cn>, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() Date: Thu, 9 Mar 2023 10:16:36 +0800 Message-Id: <20230309021636.528601-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759855595939501153?= X-GMAIL-MSGID: =?utf-8?q?1759855595939501153?= |
Series |
[v2] wifi: rtw88: fix memory leak in rtw_usb_probe()
|
|
Commit Message
Dongliang Mu
March 9, 2023, 2:16 a.m. UTC
drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe()
warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811
Fix this by modifying return to a goto statement.
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
---
v1->v2: modify the commit title
drivers/net/wireless/realtek/rtw88/usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
> -----Original Message----- > From: Dongliang Mu <dzm91@hust.edu.cn> > Sent: Thursday, March 9, 2023 10:17 AM > To: Yan-Hsuan Chuang <tony0620emma@gmail.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com> > Cc: Dongliang Mu <dzm91@hust.edu.cn>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() > > drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() > warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 Can I know which tool can detect this? It would be good to mention the tool in commit message. > > Fix this by modifying return to a goto statement. > > Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> > --- > v1->v2: modify the commit title > drivers/net/wireless/realtek/rtw88/usb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c > index 2a8336b1847a..68e1b782d199 100644 > --- a/drivers/net/wireless/realtek/rtw88/usb.c > +++ b/drivers/net/wireless/realtek/rtw88/usb.c > @@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) > > ret = rtw_usb_alloc_rx_bufs(rtwusb); > if (ret) > - return ret; > + goto err_release_hw; > > ret = rtw_core_init(rtwdev); > if (ret) > -- > 2.39.2
> On Mar 9, 2023, at 11:47, Ping-Ke Shih <pkshih@realtek.com> wrote: > > > >> -----Original Message----- >> From: Dongliang Mu <dzm91@hust.edu.cn> >> Sent: Thursday, March 9, 2023 10:17 AM >> To: Yan-Hsuan Chuang <tony0620emma@gmail.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller >> <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni >> <pabeni@redhat.com> >> Cc: Dongliang Mu <dzm91@hust.edu.cn>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org; >> linux-kernel@vger.kernel.org >> Subject: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() >> >> drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() >> warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 > > Can I know which tool can detect this? It would be good to mention the tool > in commit message. > Oh, Smatch, I forget to mention it. >> >> Fix this by modifying return to a goto statement. >> >> Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> >> --- >> v1->v2: modify the commit title >> drivers/net/wireless/realtek/rtw88/usb.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c >> index 2a8336b1847a..68e1b782d199 100644 >> --- a/drivers/net/wireless/realtek/rtw88/usb.c >> +++ b/drivers/net/wireless/realtek/rtw88/usb.c >> @@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) >> >> ret = rtw_usb_alloc_rx_bufs(rtwusb); >> if (ret) >> - return ret; >> + goto err_release_hw; >> >> ret = rtw_core_init(rtwdev); >> if (ret) >> -- >> 2.39.2
> -----Original Message----- > From: Dongliang Mu <dzm91@hust.edu.cn> > Sent: Thursday, March 9, 2023 11:53 AM > To: Ping-Ke Shih <pkshih@realtek.com> > Cc: Yan-Hsuan Chuang <tony0620emma@gmail.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() > > > On Mar 9, 2023, at 11:47, Ping-Ke Shih <pkshih@realtek.com> wrote: > > > > > > > >> -----Original Message----- > >> From: Dongliang Mu <dzm91@hust.edu.cn> > >> Sent: Thursday, March 9, 2023 10:17 AM > >> To: Yan-Hsuan Chuang <tony0620emma@gmail.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller > >> <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo > Abeni > >> <pabeni@redhat.com> > >> Cc: Dongliang Mu <dzm91@hust.edu.cn>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org; > >> linux-kernel@vger.kernel.org > >> Subject: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() > >> > >> drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() > >> warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 > > > > Can I know which tool can detect this? It would be good to mention the tool > > in commit message. > > > > Oh, Smatch, I forget to mention it. Thanks. It seems like my smatch is too old. > > >> > >> Fix this by modifying return to a goto statement. > >> > >> Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> > >> --- > >> v1->v2: modify the commit title > >> drivers/net/wireless/realtek/rtw88/usb.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c > >> index 2a8336b1847a..68e1b782d199 100644 > >> --- a/drivers/net/wireless/realtek/rtw88/usb.c > >> +++ b/drivers/net/wireless/realtek/rtw88/usb.c > >> @@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) > >> > >> ret = rtw_usb_alloc_rx_bufs(rtwusb); > >> if (ret) > >> - return ret; > >> + goto err_release_hw; > >> > >> ret = rtw_core_init(rtwdev); > >> if (ret) > >> -- > >> 2.39.2 > > > ------Please consider the environment before printing this e-mail.
> -----Original Message----- > From: Dongliang Mu <dzm91@hust.edu.cn> > Sent: Thursday, March 9, 2023 10:17 AM > To: Yan-Hsuan Chuang <tony0620emma@gmail.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com> > Cc: Dongliang Mu <dzm91@hust.edu.cn>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: [PATCH v2] wifi: rtw88: fix memory leak in rtw_usb_probe() > > drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() > warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 > > Fix this by modifying return to a goto statement. > > Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> > --- > v1->v2: modify the commit title > drivers/net/wireless/realtek/rtw88/usb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c > index 2a8336b1847a..68e1b782d199 100644 > --- a/drivers/net/wireless/realtek/rtw88/usb.c > +++ b/drivers/net/wireless/realtek/rtw88/usb.c > @@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) > > ret = rtw_usb_alloc_rx_bufs(rtwusb); > if (ret) > - return ret; > + goto err_release_hw; > > ret = rtw_core_init(rtwdev); > if (ret) > -- > 2.39.2
Dongliang Mu <dzm91@hust.edu.cn> wrote: > drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() > warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 > > Fix this by modifying return to a goto statement. > > Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> > Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> Patch applied to wireless-next.git, thanks. 48181d285623 wifi: rtw88: fix memory leak in rtw_usb_probe()
diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c index 2a8336b1847a..68e1b782d199 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) ret = rtw_usb_alloc_rx_bufs(rtwusb); if (ret) - return ret; + goto err_release_hw; ret = rtw_core_init(rtwdev); if (ret)