mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
d4d8257754
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: ea44d19076
("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>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20191022093017.8027-1-suwan.kim027@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
257 lines
5.9 KiB
C
257 lines
5.9 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2003-2008 Takahiro Hirofuchi
|
|
*/
|
|
|
|
#include <linux/kthread.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include "usbip_common.h"
|
|
#include "vhci.h"
|
|
|
|
static void setup_cmd_submit_pdu(struct usbip_header *pdup, struct urb *urb)
|
|
{
|
|
struct vhci_priv *priv = ((struct vhci_priv *)urb->hcpriv);
|
|
struct vhci_device *vdev = priv->vdev;
|
|
|
|
usbip_dbg_vhci_tx("URB, local devnum %u, remote devid %u\n",
|
|
usb_pipedevice(urb->pipe), vdev->devid);
|
|
|
|
pdup->base.command = USBIP_CMD_SUBMIT;
|
|
pdup->base.seqnum = priv->seqnum;
|
|
pdup->base.devid = vdev->devid;
|
|
pdup->base.direction = usb_pipein(urb->pipe) ?
|
|
USBIP_DIR_IN : USBIP_DIR_OUT;
|
|
pdup->base.ep = usb_pipeendpoint(urb->pipe);
|
|
|
|
usbip_pack_pdu(pdup, urb, USBIP_CMD_SUBMIT, 1);
|
|
|
|
if (urb->setup_packet)
|
|
memcpy(pdup->u.cmd_submit.setup, urb->setup_packet, 8);
|
|
}
|
|
|
|
static struct vhci_priv *dequeue_from_priv_tx(struct vhci_device *vdev)
|
|
{
|
|
struct vhci_priv *priv, *tmp;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
|
|
list_for_each_entry_safe(priv, tmp, &vdev->priv_tx, list) {
|
|
list_move_tail(&priv->list, &vdev->priv_rx);
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
return priv;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int vhci_send_cmd_submit(struct vhci_device *vdev)
|
|
{
|
|
struct usbip_iso_packet_descriptor *iso_buffer = NULL;
|
|
struct vhci_priv *priv = NULL;
|
|
struct scatterlist *sg;
|
|
|
|
struct msghdr msg;
|
|
struct kvec *iov;
|
|
size_t txsize;
|
|
|
|
size_t total_size = 0;
|
|
int iovnum;
|
|
int err = -ENOMEM;
|
|
int i;
|
|
|
|
while ((priv = dequeue_from_priv_tx(vdev)) != NULL) {
|
|
int ret;
|
|
struct urb *urb = priv->urb;
|
|
struct usbip_header pdu_header;
|
|
|
|
txsize = 0;
|
|
memset(&pdu_header, 0, sizeof(pdu_header));
|
|
memset(&msg, 0, sizeof(msg));
|
|
memset(&iov, 0, sizeof(iov));
|
|
|
|
usbip_dbg_vhci_tx("setup txdata urb seqnum %lu\n",
|
|
priv->seqnum);
|
|
|
|
if (urb->num_sgs && usb_pipeout(urb->pipe))
|
|
iovnum = 2 + urb->num_sgs;
|
|
else
|
|
iovnum = 3;
|
|
|
|
iov = kcalloc(iovnum, sizeof(*iov), GFP_KERNEL);
|
|
if (!iov) {
|
|
usbip_event_add(&vdev->ud, SDEV_EVENT_ERROR_MALLOC);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
if (urb->num_sgs)
|
|
urb->transfer_flags |= URB_DMA_MAP_SG;
|
|
|
|
/* 1. setup usbip_header */
|
|
setup_cmd_submit_pdu(&pdu_header, urb);
|
|
usbip_header_correct_endian(&pdu_header, 1);
|
|
iovnum = 0;
|
|
|
|
iov[iovnum].iov_base = &pdu_header;
|
|
iov[iovnum].iov_len = sizeof(pdu_header);
|
|
txsize += sizeof(pdu_header);
|
|
iovnum++;
|
|
|
|
/* 2. setup transfer buffer */
|
|
if (!usb_pipein(urb->pipe) && urb->transfer_buffer_length > 0) {
|
|
if (urb->num_sgs &&
|
|
!usb_endpoint_xfer_isoc(&urb->ep->desc)) {
|
|
for_each_sg(urb->sg, sg, urb->num_sgs, i) {
|
|
iov[iovnum].iov_base = sg_virt(sg);
|
|
iov[iovnum].iov_len = sg->length;
|
|
iovnum++;
|
|
}
|
|
} else {
|
|
iov[iovnum].iov_base = urb->transfer_buffer;
|
|
iov[iovnum].iov_len =
|
|
urb->transfer_buffer_length;
|
|
iovnum++;
|
|
}
|
|
txsize += urb->transfer_buffer_length;
|
|
}
|
|
|
|
/* 3. setup iso_packet_descriptor */
|
|
if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
|
|
ssize_t len = 0;
|
|
|
|
iso_buffer = usbip_alloc_iso_desc_pdu(urb, &len);
|
|
if (!iso_buffer) {
|
|
usbip_event_add(&vdev->ud,
|
|
SDEV_EVENT_ERROR_MALLOC);
|
|
goto err_iso_buffer;
|
|
}
|
|
|
|
iov[iovnum].iov_base = iso_buffer;
|
|
iov[iovnum].iov_len = len;
|
|
iovnum++;
|
|
txsize += len;
|
|
}
|
|
|
|
ret = kernel_sendmsg(vdev->ud.tcp_socket, &msg, iov, iovnum,
|
|
txsize);
|
|
if (ret != txsize) {
|
|
pr_err("sendmsg failed!, ret=%d for %zd\n", ret,
|
|
txsize);
|
|
usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_TCP);
|
|
err = -EPIPE;
|
|
goto err_tx;
|
|
}
|
|
|
|
kfree(iov);
|
|
/* This is only for isochronous case */
|
|
kfree(iso_buffer);
|
|
iso_buffer = NULL;
|
|
|
|
usbip_dbg_vhci_tx("send txdata\n");
|
|
|
|
total_size += txsize;
|
|
}
|
|
|
|
return total_size;
|
|
|
|
err_tx:
|
|
kfree(iso_buffer);
|
|
err_iso_buffer:
|
|
kfree(iov);
|
|
|
|
return err;
|
|
}
|
|
|
|
static struct vhci_unlink *dequeue_from_unlink_tx(struct vhci_device *vdev)
|
|
{
|
|
struct vhci_unlink *unlink, *tmp;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
|
|
list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
|
|
list_move_tail(&unlink->list, &vdev->unlink_rx);
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
return unlink;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int vhci_send_cmd_unlink(struct vhci_device *vdev)
|
|
{
|
|
struct vhci_unlink *unlink = NULL;
|
|
|
|
struct msghdr msg;
|
|
struct kvec iov;
|
|
size_t txsize;
|
|
size_t total_size = 0;
|
|
|
|
while ((unlink = dequeue_from_unlink_tx(vdev)) != NULL) {
|
|
int ret;
|
|
struct usbip_header pdu_header;
|
|
|
|
memset(&pdu_header, 0, sizeof(pdu_header));
|
|
memset(&msg, 0, sizeof(msg));
|
|
memset(&iov, 0, sizeof(iov));
|
|
|
|
usbip_dbg_vhci_tx("setup cmd unlink, %lu\n", unlink->seqnum);
|
|
|
|
/* 1. setup usbip_header */
|
|
pdu_header.base.command = USBIP_CMD_UNLINK;
|
|
pdu_header.base.seqnum = unlink->seqnum;
|
|
pdu_header.base.devid = vdev->devid;
|
|
pdu_header.base.ep = 0;
|
|
pdu_header.u.cmd_unlink.seqnum = unlink->unlink_seqnum;
|
|
|
|
usbip_header_correct_endian(&pdu_header, 1);
|
|
|
|
iov.iov_base = &pdu_header;
|
|
iov.iov_len = sizeof(pdu_header);
|
|
txsize = sizeof(pdu_header);
|
|
|
|
ret = kernel_sendmsg(vdev->ud.tcp_socket, &msg, &iov, 1, txsize);
|
|
if (ret != txsize) {
|
|
pr_err("sendmsg failed!, ret=%d for %zd\n", ret,
|
|
txsize);
|
|
usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_TCP);
|
|
return -1;
|
|
}
|
|
|
|
usbip_dbg_vhci_tx("send txdata\n");
|
|
|
|
total_size += txsize;
|
|
}
|
|
|
|
return total_size;
|
|
}
|
|
|
|
int vhci_tx_loop(void *data)
|
|
{
|
|
struct usbip_device *ud = data;
|
|
struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);
|
|
|
|
while (!kthread_should_stop()) {
|
|
if (vhci_send_cmd_submit(vdev) < 0)
|
|
break;
|
|
|
|
if (vhci_send_cmd_unlink(vdev) < 0)
|
|
break;
|
|
|
|
wait_event_interruptible(vdev->waitq_tx,
|
|
(!list_empty(&vdev->priv_tx) ||
|
|
!list_empty(&vdev->unlink_tx) ||
|
|
kthread_should_stop()));
|
|
|
|
usbip_dbg_vhci_tx("pending urbs ?, now wake up\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|