Patch "usbip: prevent leaking socket pointer address in messages" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usbip: prevent leaking socket pointer address in messages
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usbip-prevent-leaking-socket-pointer-address-in-messages.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
90120d15f4c397272aaf41077960a157fc4212bfMon Sep 17 00:00:00 2001
From: Shuah Khan <[email protected]>
Date: Fri, 15 Dec 2017 10:50:09 -0700
Subject: usbip: prevent leaking socket pointer address in messages
From: Shuah Khan <[email protected]>
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.
--- drivers/usb/usbip/stub_dev.c | 3 +-- drivers/usb/usbip/usbip_common.c | 16 +++++----------- drivers/usb/usbip/vhci_hcd.c | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-)
drivers/usb/usbip/stub_dev.c +1 -2
@@ -163,8 +163,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 ); }
drivers/usb/usbip/usbip_common.c +5 -11
@@ -331,26 +331,20 @@ int usbip_recv(struct socket *sock, voidstruct msghdr msg = {.msg_flags =MSG_NOSIGNAL };int total =0 ; +if (!sock || !buf || !size) +return -EINVAL ; +iov_iter_kvec (&msg.msg_iter,READ |ITER_KVEC , &iov,1 , size);usbip_dbg_xmit ("enter\n" ); -if (!sock || !buf || !size) { -pr_err ("invalid arg, sock %p buff %p size %d\n" , sock, buf, - size); -return -EINVAL ; - } -do { -int sz =msg_data_left (&msg); +msg_data_left (&msg); sock->sk->sk_allocation =GFP_NOIO ; result =sock_recvmsg (sock, &msg,MSG_WAITALL ); -if (result <=0 ) { -pr_debug ("receive sock %p buf %p size %u ret %d total %d\n" , - sock, buf + total, sz, result, total); +if (result <=0 ) goto err; - } total += result; }while (msg_data_left (&msg));
drivers/usb/usbip/vhci_hcd.c +1 -1
@@ -989,7 +989,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 ); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/usbip-vhci-stop-printing-kernel-pointer-addresses-in-messages.patch queue-4.14/usbip-fix-usbip-bind-writing-random-string-after-command-in-match_busid.patch queue-4.14/usbip-prevent-leaking-socket-pointer-address-in-messages.patch queue-4.14/usbip-stub-stop-printing-kernel-pointer-addresses-in-messages.patch