]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usbip: Replace unused kvec array with single variable in vhci_send_cmd_unlink()
authorSuwan Kim <suwan.kim027@gmail.com>
Mon, 3 Jun 2019 15:02:11 +0000 (00:02 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jun 2019 09:54:38 +0000 (11:54 +0200)
vhci_send_cmd_unlink() declears kvec array of size 3 but it actually
uses just one element of the array. So, remove kvec array and replace
it with single kvec variable.

Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/usbip/vhci_tx.c

index 9aed15a358b7b98b0fab9e6b02b6820cff9ff808..2fa26d0578d73e6a1b06e900aca8fe87a5e89a31 100644 (file)
@@ -144,16 +144,14 @@ static int vhci_send_cmd_unlink(struct vhci_device *vdev)
        struct vhci_unlink *unlink = NULL;
 
        struct msghdr msg;
-       struct kvec iov[3];
+       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;
 
-               txsize = 0;
                memset(&pdu_header, 0, sizeof(pdu_header));
                memset(&msg, 0, sizeof(msg));
                memset(&iov, 0, sizeof(iov));
@@ -169,11 +167,11 @@ static int vhci_send_cmd_unlink(struct vhci_device *vdev)
 
                usbip_header_correct_endian(&pdu_header, 1);
 
-               iov[0].iov_base = &pdu_header;
-               iov[0].iov_len  = sizeof(pdu_header);
-               txsize += sizeof(pdu_header);
+               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);
+               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);