Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp460808pxb; Thu, 9 Sep 2021 05:06:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzi3nJgaoRLyqnJBjYWzKx24XQdp5LC+0kL9xhtXbrn23mXuVc7NhRqKz3p5H1QQEzduFxL X-Received: by 2002:a02:94e4:: with SMTP id x91mr2509992jah.99.1631189210637; Thu, 09 Sep 2021 05:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631189210; cv=none; d=google.com; s=arc-20160816; b=vL5itIG2cEROqeXKN7YiiuDOl3Yq0yGRk9IQZivfPdy17bdZ5iivs3DSaiNEWDCCfn MvUP7CqUgVS+xNHaZPNnlAIXM/tEYD4JoeY2g4TRiW6CJoupMIOotMz2sbVaS3WprCZI I9rzVvNtHbeQvZ3Md7Kbo76cjxl/QLRUZenzq+JEZmeHjRBBPf8T9qmYGTavn6kKxq3y T2vkZBPuATRWQRgaRT7WLV1deufvRD8Pa6XsZ55KrvEIOmxp4hSQPv2rPbUrPB9vPx6J 9P7jxhwUyZNw5lEJ1D5TBQAu+t7bepkDdkL2C6clufoHF0z3ayix8omTaN/p/Z/nh0cy qlYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fx8T8mJ+YCqXO2aPBwNyz/VBww6hrH01Hn931GOqJow=; b=pR3+wUTDmOyXLScZoAkNrAwMhJlYzAA5kJKZ4mTFoplHYnQn/P8NnUp2ZeJsQsI/P8 5Oob0TJRCVUt4SjsGc5X7+/Rgyl+weGwFU0pLNdTQhqIvoFd1+VC606lMhedS09nVdYh z5QqgpoVQOLwX+yM1qUM4HDgjgqOCDnPKVkQQpKhWOGHm0+M+f2HD4/xqLKcIcOjly/d oPHTUnfIAu+khpQ6BCh2n0vgdtOzbWzN6hFjCshp9ex9LC4Uz533MpcXW3vbP5EhDeP8 E5iGJv/U5rhE2WN47OoI/agiVrIMpuDyIUbg7nYuQs5chZiKiyDyXekpgGteLiXVlaXE 3Y/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QZYdV54N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k5si1782877jaa.25.2021.09.09.05.06.27; Thu, 09 Sep 2021 05:06:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QZYdV54N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346969AbhIIMEK (ORCPT + 99 others); Thu, 9 Sep 2021 08:04:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:34544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243098AbhIIL6o (ORCPT ); Thu, 9 Sep 2021 07:58:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 320DF6140A; Thu, 9 Sep 2021 11:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187950; bh=7mmHLthpFheFiPyehS8KBoLv55k9vZhDiW0Qcdq4vcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QZYdV54NBppI3exc49Xh2mKyGH5x5D8T2GUb6jysRqsj6SZ0M75D0FiC3ER3uhMFG 6Uf3vazAMqDiel6rjewkKf0twnpd9Yei/9Oy2CWa1w848OPRoQ83gaMgSbjOicqrIR oUYYofYyAeZHKIHRxeuegL0ya6M007Mwnby7oIbhPomNRxi/TvXt3NW2YM3iTKR6WL cXb5++iD6aqhn4X3kVXNkINN+DXBjVz6ny9oz/9j328Yyq7XYffbAhDxrV5HpI7SR+ 6vrcZuMvcHOHwmPOxvjLGG+QW2iO0RQG5FQoKndcwmtpFye+bxRo7/y6XMx7o6L+v6 d3a9PPKmeEE/A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anirudh Rayabharam , syzbot+74d6ef051d3d2eacf428@syzkaller.appspotmail.com, Shuah Khan , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 218/252] usbip: give back URBs for unsent unlink requests during cleanup Date: Thu, 9 Sep 2021 07:40:32 -0400 Message-Id: <20210909114106.141462-218-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anirudh Rayabharam [ Upstream commit 258c81b341c8025d79073ce2d6ce19dcdc7d10d2 ] In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this. To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back. [1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76 Reported-by: syzbot+74d6ef051d3d2eacf428@syzkaller.appspotmail.com Tested-by: syzbot+74d6ef051d3d2eacf428@syzkaller.appspotmail.com Reviewed-by: Shuah Khan Signed-off-by: Anirudh Rayabharam Link: https://lore.kernel.org/r/20210820190122.16379-2-mail@anirudhrb.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/usbip/vhci_hcd.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c index 4ba6bcdaa8e9..190bd3d1c1f0 100644 --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -957,8 +957,32 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev) spin_lock(&vdev->priv_lock); list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) { + struct urb *urb; + + /* give back urb of unsent unlink request */ pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum); + + urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum); + if (!urb) { + list_del(&unlink->list); + kfree(unlink); + continue; + } + + urb->status = -ENODEV; + + usb_hcd_unlink_urb_from_ep(hcd, urb); + list_del(&unlink->list); + + spin_unlock(&vdev->priv_lock); + spin_unlock_irqrestore(&vhci->lock, flags); + + usb_hcd_giveback_urb(hcd, urb, urb->status); + + spin_lock_irqsave(&vhci->lock, flags); + spin_lock(&vdev->priv_lock); + kfree(unlink); } -- 2.30.2