From: Dan Carpenter <dan.carpenter@oracle.com>
To: Xiaoke Wang <xkernel.wang@foxmail.com>
Cc: "Larry.Finger" <Larry.Finger@lwfinger.net>,
phil <phil@philpotter.co.uk>, gregkh <gregkh@linuxfoundation.org>,
linux-staging <linux-staging@lists.linux.dev>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: Re: [PATCH 2/2] staging: r8188eu: fix potential memory leak in _rtw_init_xmit_priv()
Date: Thu, 31 Mar 2022 11:49:20 +0300 [thread overview]
Message-ID: <20220331084920.GB12805@kadam> (raw)
In-Reply-To: <tencent_B595FD8B8004319BE5AE71A052A08683280A@qq.com>
On Thu, Mar 31, 2022 at 04:21:45PM +0800, Xiaoke Wang wrote:
> On Thu 31 Mar 2022 15:36:21 +0800, dan.carpenter@oracle.com wrote:
> >> @@ -134,7 +134,12 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
> >> msleep(10);
> >> res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
> >> if (res == _FAIL) {
> >> - goto exit;
> >> + pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
> >> + for (; i >= 0; i--) {
> >
> > This frees one more element than you intended. It should be:
> >
> > while (--i >= 0) {
> >
>
> In fact, this is considering that we do not know where is the failure
> from. In rtw_os_xmit_resource_alloc(), the failure can from
>
> > pxmitbuf->pallocated_buf = kzalloc(alloc_sz, GFP_KERNEL);
>
> , but also can from
>
> > pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
>
> So if we do not handle the current failed item and just skip it, then some
> memory may be ignored.
The rtw_os_xmit_resource_alloc() function should clean up after itself
and not leave things partially allocated.
First of all MAX_XMITBUF_SZ is 20480 bytes. It's giant. We need to
figure out what's up with that. But then if "pxmitbuf->pxmit_urb[i] =
usb_alloc_urb(0, GFP_KERNEL);" fails, we allocate directly over the
pxmitbuf->pallocated_buf on the second attempt. So it leaks memory.
Every function should clean up after itself. No partial allocations.
That always leads to bugs.
regards,
dan carpenter
next prev parent reply other threads:[~2022-03-31 8:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 15:16 [PATCH 1/2] staging: r8188eu: properly handle the kzalloc() xkernel.wang
2022-03-30 15:29 ` [PATCH 2/2] staging: r8188eu: fix potential memory leak in _rtw_init_xmit_priv() xkernel.wang
2022-03-31 6:04 ` Greg KH
2022-03-31 7:35 ` Dan Carpenter
2022-03-31 8:21 ` Xiaoke Wang
2022-03-31 8:49 ` Dan Carpenter [this message]
[not found] ` <2022033116214474301568@foxmail.com>
2022-03-31 8:33 ` Xiaoke Wang
2022-03-31 9:20 ` Dan Carpenter
2022-03-31 6:03 ` [PATCH 1/2] staging: r8188eu: properly handle the kzalloc() Greg KH
2022-03-31 6:37 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220331084920.GB12805@kadam \
--to=dan.carpenter@oracle.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=xkernel.wang@foxmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).