* [PATCH v2] usbip: Fix free of unallocated memory in vhci tx
@ 2019-10-22 9:30 Suwan Kim
2019-10-22 9:51 ` Julia Lawall
0 siblings, 1 reply; 3+ messages in thread
From: Suwan Kim @ 2019-10-22 9:30 UTC (permalink / raw)
To: shuah, gregkh
Cc: linux-kernel, linux-usb, julia.lawall, valentina.manea.m,
Suwan Kim, kbuild test robot
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>
---
v1 - v2: Move the setting NULL after kfree() and add the comment
---
drivers/usb/usbip/vhci_tx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index c3803785f6ef..0ae40a13a9fe 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -147,7 +147,10 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
}
kfree(iov);
+ /* This is only for isochronous case */
kfree(iso_buffer);
+ iso_buffer = NULL;
+
usbip_dbg_vhci_tx("send txdata\n");
total_size += txsize;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] usbip: Fix free of unallocated memory in vhci tx
2019-10-22 9:30 [PATCH v2] usbip: Fix free of unallocated memory in vhci tx Suwan Kim
@ 2019-10-22 9:51 ` Julia Lawall
2019-10-23 15:55 ` shuah
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2019-10-22 9:51 UTC (permalink / raw)
To: Suwan Kim
Cc: shuah, gregkh, linux-kernel, linux-usb, julia.lawall,
valentina.manea.m, kbuild test robot
On Tue, 22 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>
Reviewed-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
> v1 - v2: Move the setting NULL after kfree() and add the comment
> ---
> drivers/usb/usbip/vhci_tx.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
> index c3803785f6ef..0ae40a13a9fe 100644
> --- a/drivers/usb/usbip/vhci_tx.c
> +++ b/drivers/usb/usbip/vhci_tx.c
> @@ -147,7 +147,10 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
> }
>
> kfree(iov);
> + /* This is only for isochronous case */
> kfree(iso_buffer);
> + iso_buffer = NULL;
> +
> usbip_dbg_vhci_tx("send txdata\n");
>
> total_size += txsize;
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] usbip: Fix free of unallocated memory in vhci tx
2019-10-22 9:51 ` Julia Lawall
@ 2019-10-23 15:55 ` shuah
0 siblings, 0 replies; 3+ messages in thread
From: shuah @ 2019-10-23 15:55 UTC (permalink / raw)
To: Julia Lawall, Suwan Kim
Cc: gregkh, linux-kernel, linux-usb, valentina.manea.m,
kbuild test robot, shuah
On 10/22/19 3:51 AM, Julia Lawall wrote:
>
>
> On Tue, 22 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>
>
> Reviewed-by: Julia Lawall <julia.lawall@lip6.fr>
>
>> ---
>> v1 - v2: Move the setting NULL after kfree() and add the comment
>> ---
Thanks.
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-23 15:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-22 9:30 [PATCH v2] usbip: Fix free of unallocated memory in vhci tx Suwan Kim
2019-10-22 9:51 ` Julia Lawall
2019-10-23 15:55 ` shuah
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).