From: Greg KH <gregkh@linuxfoundation.org>
To: Philipp Hortmann <philipp.g.hortmann@gmail.com>,
xkernel.wang@foxmail.com, Larry.Finger@lwfinger.net,
phil@philpotter.co.uk, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: r8188eu: add kfree() on an error path of rtw_xmit_resource_alloc()
Date: Sun, 11 Sep 2022 13:59:41 +0200 [thread overview]
Message-ID: <Yx3NrRHMGbDLipWJ@kroah.com> (raw)
In-Reply-To: <75e8636b-71f4-1334-47c6-0e60f26a2d0a@gmail.com>
On Sat, Sep 10, 2022 at 08:29:03AM +0200, Philipp Hortmann wrote:
> On 9/10/22 02:29, xkernel.wang@foxmail.com wrote:
> > From: Xiaoke Wang <xkernel.wang@foxmail.com>
> >
> > In rtw_xmit_resource_alloc(), if usb_alloc_urb() fails, then the memory
> > `pxmitbuf->pallocated_buf` which is allocated by kzalloc() is not properly
> > released before returning.
> >
> > So this patch adds kfree() on the above error path to release it. As there
> > is no proper device to test with, no runtime testing was performed.
> >
> > Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
> > ---
> > drivers/staging/r8188eu/core/rtw_xmit.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> > index 67f9c05..9c39d08 100644
> > --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> > +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> > @@ -44,8 +44,10 @@ static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *px
> > pxmitbuf->dma_transfer_addr = 0;
> > pxmitbuf->pxmit_urb = usb_alloc_urb(0, GFP_KERNEL);
> > - if (!pxmitbuf->pxmit_urb)
> > + if (!pxmitbuf->pxmit_urb) {
> > + kfree(pxmitbuf->pallocated_buf);
> > return _FAIL;
> > + }
> > return _SUCCESS;
> > }
>
> Hi Xiaoke,
>
> I applied your patch and tested it. That is OK.
>
> But you excluded the change history. Usually this is not accepted by Greg.
> Reason is that what identifies the patch is the change itself. The change
> itself is the same as: "[PATCH v4] staging: r8188eu: fix potential memory
> leak in rtw_os_xmit_resource_alloc()" Even if you change the Subject,
> Description and the branch it remains the same patch for Greg.
Agreed, please fix up.
thanks,
greg k-h
prev parent reply other threads:[~2022-09-11 11:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-10 0:29 [PATCH] staging: r8188eu: add kfree() on an error path of rtw_xmit_resource_alloc() xkernel.wang
2022-09-10 6:29 ` Philipp Hortmann
2022-09-11 11:59 ` Greg KH [this message]
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=Yx3NrRHMGbDLipWJ@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Larry.Finger@lwfinger.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=philipp.g.hortmann@gmail.com \
--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