From: shuah <shuah@kernel.org>
To: Julia Lawall <julia.lawall@lip6.fr>, Suwan Kim <suwan.kim027@gmail.com>
Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org, valentina.manea.m@gmail.com,
kbuild test robot <lkp@intel.com>, shuah <shuah@kernel.org>
Subject: Re: [PATCH] usbip: Fix free of unallocated memory in vhci tx
Date: Mon, 21 Oct 2019 13:28:54 -0600 [thread overview]
Message-ID: <936d4cf8-cd5a-a297-8298-e9bc5d3c193d@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.21.1910211706240.2877@hadrien>
On 10/21/19 9:08 AM, Julia Lawall wrote:
>
>
> On Mon, 21 Oct 2019, Suwan Kim wrote:
>
>> iso_buffer should be set to NULL after use and free in the while loop.
>> In the case of isochronous URB in the while loop, iso_buffer is
>> allocated and after sending it to server, buffer is deallocated. And
>> then, if the next URB in the while loop is not a isochronous pipe,
>> iso_buffer still holds the previously deallocated buffer address and
>> kfree tries to free wrong buffer address.
>>
>> Fixes: ea44d190764b (“usbip: Implement SG support to vhci-hcd and stub driver”)
>> Reported-by: kbuild test robot <lkp@intel.com>
>> Reported-by: Julia Lawall <julia.lawall@lip6.fr>
>> Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
>> ---
>> drivers/usb/usbip/vhci_tx.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
>> index c3803785f6ef..b290e810d11b 100644
>> --- a/drivers/usb/usbip/vhci_tx.c
>> +++ b/drivers/usb/usbip/vhci_tx.c
>> @@ -73,6 +73,7 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
>> memset(&pdu_header, 0, sizeof(pdu_header));
>> memset(&msg, 0, sizeof(msg));
>> memset(&iov, 0, sizeof(iov));
>> + iso_buffer = NULL;
>
> Somehow I would have put it after the kfree, since the kfree makes the
> value invalid. iso_buffer is already initialized to NULL for the first
> iteration. If you want to put the setting to NULL at the top of the loop,
> maybe the = NULL in the first line should be removed.
>
It makes sense to clear it after kfree() on line 150.
This kfree() and clearing iso_buffer are necessary only for
PIPE_ISOCHRONOUS case.
Please add a comment above that this is for isoc case.
thanks,
-- Shuah
next prev parent reply other threads:[~2019-10-21 19:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 14:24 [PATCH] usbip: Fix free of unallocated memory in vhci tx Suwan Kim
2019-10-21 15:08 ` Julia Lawall
2019-10-21 19:28 ` shuah [this message]
2019-10-22 9:26 ` Suwan Kim
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=936d4cf8-cd5a-a297-8298-e9bc5d3c193d@kernel.org \
--to=shuah@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lkp@intel.com \
--cc=suwan.kim027@gmail.com \
--cc=valentina.manea.m@gmail.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