From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226iMf/eAj69wSoUWQqbaItpkHqniyd3LiNjYqwD3K0+ZnDSQrDaHvvwnUobUhcpqmcJZ3P2 ARC-Seal: i=1; a=rsa-sha256; t=1517256569; cv=none; d=google.com; s=arc-20160816; b=bjrRyxP2tdI+d+k2ojirlOZTsgJCCvruhEtbVvrG+oU5XVT4BoYw78z9Ud4sjjTBs2 0qpSl13O08nBzghoeMjIzXGuvjhubq3anJWrSMNX5UYFTA6QAUrI/TPh6gpnjdIb0pto 7CG5lQhocd4jykE+IPmu5UQUE/C2+93PqiS+CdZVAHxLognuvsvuPk7a5x+eP87PE64P a5Y3ilcDAdH6uZYSpH3HtTdq7yvdou3YdiXu+BD7uXGUZFXA69VwsoTiBEpQNCQ34IAa xMkFypGkawAuv01yOiCELiS6IOrBn9xjznqjsgbo6ktJ/kXNTbipfWnp7lFSlanOzJc7 8tug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=qc1N9tOC3xC5/QxaFcTVKW/5MD5i9qKcs/XvZD4cyHs=; b=H5kSEURSMNAplA+Bqv9rDvJRhjl81XuRpzjSaiB3q2ejcuBguDhKol9QtOwN83nGEg dIKNExi7qptsLdOg/m+DUyZcCfXmr/Ow/xvnbPqAoYWTMCzuZa4Eh2QX2YINryGDkaiP YEBKbGgCmo8MPyTf6Tg6rQOzz9eoJdAPtDeS29R3LiGQq/2iOFncWAtwL83ivojVvuoQ VizuaDorQVAtE2heJQZDXRIC0XoPIlUzh8zGDDTBbaXinHRSjULJlDGkW1DZMqbmT9Ub terEZqUSOV0NQblOXVZSgF+I+J3JD7rIu2JNIASID7hsPrHm0bmjJvSvMMq39mpxYT77 ciHw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan Subject: [PATCH 4.4 52/74] usbip: prevent leaking socket pointer address in messages Date: Mon, 29 Jan 2018 13:56:57 +0100 Message-Id: <20180129123849.928797046@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958825283430038?= X-GMAIL-MSGID: =?utf-8?q?1590958825283430038?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuah Khan 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/stub_dev.c | 3 +-- drivers/usb/usbip/usbip_common.c | 15 ++++----------- drivers/usb/usbip/vhci_hcd.c | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) --- a/drivers/usb/usbip/stub_dev.c +++ b/drivers/usb/usbip/stub_dev.c @@ -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); } --- a/drivers/usb/usbip/usbip_common.c +++ b/drivers/usb/usbip/usbip_common.c @@ -317,18 +317,14 @@ int usbip_recv(struct socket *sock, void struct msghdr msg; struct kvec iov; int total = 0; - /* for blocks of if (usbip_dbg_flag_xmit) */ 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; @@ -341,11 +337,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/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -778,7 +778,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 sockfd %d\n", ud->sockfd); kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR); }