Received: by 10.223.185.116 with SMTP id b49csp1078586wrg; Fri, 23 Feb 2018 11:31:50 -0800 (PST) X-Google-Smtp-Source: AH8x226CqzCJVpI5JuRt34yLCEYoUsbGjxFdiH43MbDWJHbhlIc5Ba3eyQK8bfXcX23D8FIaiBO4 X-Received: by 10.99.189.82 with SMTP id d18mr2261616pgp.172.1519414310042; Fri, 23 Feb 2018 11:31:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414309; cv=none; d=google.com; s=arc-20160816; b=qSrXuQ6ooP2LJAwUIU3qAQm+uRGjIc2UU67NIdt6ZRgjfWQ/Z/GtiRyGSkyKgxQrJY p1jZxA0F1teJh/PHdK7qo/E/hcxHiVRSfNhFDzdaR8XXpty7j5UtecuzmT1gNQh0IzVc onYJo+9K3xOPCoVvlbOM4uFOIw8hN5CJwFvKJVsxwaO5R+pP2QN8wKa2/c+XbEi96CKO FXiaTGDpAoPxU6Y3kM/qwpdTHVv1Z4+/Ft07OzBfGxX+ELLO+xQbvIY4iUZyEVM/DhZg Mg/6AXdTnHbHN+hxDLPKn++EwN1YARJ/M73THEY3+WDkehpL6/heA5xS4i2ZA3MwY9qT uAvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=2xpoRsIo/KQI5Lk90iDCutMBzODhNSk5Q6Q3UKokA5w=; b=Ev33WlnzYW4bYxSAOa4yITCmFkfEzUm+Pj4bK6V/afBBxhZbEdWJH+x69kjL9GV7uI eIud25n0Q3fKB/zb7+CByvifAcQivDkNGnh31xb7Eyf00ZOEmY19QzhpnULaURZnqnXH oPcyJr5IVJcgSLeyskXCfQVQ4JoT0T/OfCDswc2p73xTY/CPiB1DlnJM3XngKHGu+0Kk nZ6OhmBwt4ry+IVb6IA31y/8AzRR/OUMmF9ftNRat6lG1k4efUjCre/M4WztyjuRGQNl xNq9RBiZi2uStGocr++8ko0miGqZ93I6z961pub7EhYv1O8GLb2qn06X7I7G7Sqsuc50 7SzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c6si1862926pgn.681.2018.02.23.11.31.35; Fri, 23 Feb 2018 11:31:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935037AbeBWSvw (ORCPT + 99 others); Fri, 23 Feb 2018 13:51:52 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46148 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934465AbeBWSvt (ORCPT ); Fri, 23 Feb 2018 13:51:49 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 9F503259; Fri, 23 Feb 2018 18:51:48 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan Subject: [PATCH 4.14 058/159] usbip: keep usbip_device sockfd state in sync with tcp_socket Date: Fri, 23 Feb 2018 19:26:06 +0100 Message-Id: <20180223170750.635565694@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuah Khan commit 009f41aed4b3e11e6dc1e3c07377a10c20f1a5ed upstream. Keep usbip_device sockfd state in sync with tcp_socket. When tcp_socket is reset to null, reset sockfd to -1 to keep it in sync. Signed-off-by: Shuah Khan Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/stub_dev.c | 3 +++ drivers/usb/usbip/vhci_hcd.c | 2 ++ 2 files changed, 5 insertions(+) --- a/drivers/usb/usbip/stub_dev.c +++ b/drivers/usb/usbip/stub_dev.c @@ -87,6 +87,7 @@ static ssize_t store_sockfd(struct devic goto err; sdev->ud.tcp_socket = socket; + sdev->ud.sockfd = sockfd; spin_unlock_irq(&sdev->ud.lock); @@ -186,6 +187,7 @@ static void stub_shutdown_connection(str if (ud->tcp_socket) { sockfd_put(ud->tcp_socket); ud->tcp_socket = NULL; + ud->sockfd = -1; } /* 3. free used data */ @@ -280,6 +282,7 @@ static struct stub_device *stub_device_a sdev->ud.status = SDEV_ST_AVAILABLE; spin_lock_init(&sdev->ud.lock); sdev->ud.tcp_socket = NULL; + sdev->ud.sockfd = -1; INIT_LIST_HEAD(&sdev->priv_init); INIT_LIST_HEAD(&sdev->priv_tx); --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -998,6 +998,7 @@ static void vhci_shutdown_connection(str if (vdev->ud.tcp_socket) { sockfd_put(vdev->ud.tcp_socket); vdev->ud.tcp_socket = NULL; + vdev->ud.sockfd = -1; } pr_info("release socket\n"); @@ -1044,6 +1045,7 @@ static void vhci_device_reset(struct usb if (ud->tcp_socket) { sockfd_put(ud->tcp_socket); ud->tcp_socket = NULL; + ud->sockfd = -1; } ud->status = VDEV_ST_NULL;