lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 060/140] usbip: prevent leaking socket pointer address in messages
    3.2.100-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Shuah Khan <shuahkh@osg.samsung.com>

    commit 90120d15f4c397272aaf41077960a157fc4212bf upstream.

    usbip driver is leaking socket pointer address in messages. Remove
    the messages that aren't useful and print sockfd in the ones that
    are useful for debugging.

    Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.2: adjust filenames, context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- a/drivers/staging/usbip/stub_dev.c
    +++ b/drivers/staging/usbip/stub_dev.c
    @@ -186,8 +186,7 @@ static void stub_shutdown_connection(str
    * step 1?
    */
    if (ud->tcp_socket) {
    - dev_dbg(&sdev->udev->dev, "shutdown tcp_socket %p\n",
    - ud->tcp_socket);
    + dev_dbg(&sdev->udev->dev, "shutdown sockfd %d\n", ud->sockfd);
    kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);
    }

    --- a/drivers/staging/usbip/usbip_common.c
    +++ b/drivers/staging/usbip/usbip_common.c
    @@ -346,13 +346,10 @@ int usbip_recv(struct socket *sock, void
    char *bp = buf;
    int osize = size;

    - usbip_dbg_xmit("enter\n");
    -
    - if (!sock || !buf || !size) {
    - pr_err("invalid arg, sock %p buff %p size %d\n", sock, buf,
    - size);
    + if (!sock || !buf || !size)
    return -EINVAL;
    - }
    +
    + usbip_dbg_xmit("enter\n");

    do {
    sock->sk->sk_allocation = GFP_NOIO;
    @@ -366,11 +363,8 @@ int usbip_recv(struct socket *sock, void
    msg.msg_flags = MSG_NOSIGNAL;

    result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL);
    - if (result <= 0) {
    - pr_debug("receive sock %p buf %p size %u ret %d total %d\n",
    - sock, buf, size, result, total);
    + if (result <= 0)
    goto err;
    - }

    size -= result;
    buf += result;
    --- a/drivers/staging/usbip/vhci_hcd.c
    +++ b/drivers/staging/usbip/vhci_hcd.c
    @@ -811,7 +811,7 @@ static void vhci_shutdown_connection(str

    /* need this? see stub_dev.c */
    if (ud->tcp_socket) {
    - pr_debug("shutdown tcp_socket %p\n", ud->tcp_socket);
    + pr_debug("shutdown tcp_socket %d\n", ud->sockfd);
    kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);
    }

    \
     
     \ /
      Last update: 2018-02-28 16:42    [W:5.858 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site