Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2988349ybt; Mon, 29 Jun 2020 12:13:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX9deBjwn/MnRYTsri7vjJlzg1Tu+Elwo3wC3QSbPZmD3rN4vmKfZpqL4xqdrNUgeLdEIO X-Received: by 2002:a50:a1e7:: with SMTP id 94mr18741452edk.165.1593457989376; Mon, 29 Jun 2020 12:13:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593457989; cv=none; d=google.com; s=arc-20160816; b=wt73KYiuvuy6OhjqpJUmhXsSn2KS1mODPYbn3Nmrzi30XMlgffhB1sEBhPX3GrBOnp rNrEAcAeH4+ju0PZzlDecL6wsheix+y/kUE2ymCVNU5RBs6piBTcgVjL3OXwTnYlh0Kf yWfTzp8+y1Q9ykdbzmNnB7bJ66geC3A0Gw0IlfWkjr4zboYLIYHBAM8uj/RvKIHpNtPv AOtx8U3PsXGz+xGbvNdn0MzBnw093+dQZ0hRVqoAXvIE6DxDkaj6oXL8FCqJbjAzFfwR NhW/Sjgx3QfXO3TwflEsXh5N+eHAo4f8Jjj9jCdisbhR2dzzegwNVqyOxf3G4jVZctlu w0Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IUtWskAsJMiqx8MoWQqHlm099piyZh9RcWxn//EYr0o=; b=je+U7QmTDUvargiGs7kYM5ncfQyBmzTRKlvMzy1YcDBhQccL6T2m5m1QuZWYFdTz/A 79drAeqdMtRAbud+R4Pr2N71SZu/4oHOeSsF7CnpysuN2x68vMdje0cbZPs4LJkRDaqJ tSl56iPdxtczBRcWCqPV5LGwbiuNURstJOrr6hdiTONybp+Hvo2EpnQCWt7ZSmMc44wK 4GNIdJZM8/rihKJzCfg6KxBjIikNdxNE82soYMVBTxugcA9w2NTsNrXPeAODc22O6TC4 GSFknuvATL2hl0hT+F1cTpQTzck9XR8X/zuT1347jOGN6co3Bn0yatI6h5S2IhLmfYl9 XN1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DrjgGUxA; 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 p25si262760edy.109.2020.06.29.12.12.46; Mon, 29 Jun 2020 12:13:09 -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=default header.b=DrjgGUxA; 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 S1731123AbgF2TMp (ORCPT + 99 others); Mon, 29 Jun 2020 15:12:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:53788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730968AbgF2TKS (ORCPT ); Mon, 29 Jun 2020 15:10:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB9EE254A6; Mon, 29 Jun 2020 15:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446000; bh=H4bLp+NXSxDVf8zAgb8bhAnGb5CXhl2QrEc45pTUjk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DrjgGUxASs1xU9EfzrSc7h0cEyDaDpWLWYrtASy/Osoq1niqG1kwRvKsOf8sNAFaQ R/j19Smb9Hr45RPmN5hdklAmqc6RfSBnyOMApUI+xW2FKI5SWOExI6Ic8lVOv4FonW iVuuucKGSQhCRB34ZXNXTkGOKGosqMgifA/UmKio= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , syzbot+be5b5f86a162a6c281e6@syzkaller.appspotmail.com, Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 4.4 008/135] usblp: poison URBs upon disconnect Date: Mon, 29 Jun 2020 11:51:02 -0400 Message-Id: <20200629155309.2495516-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oliver Neukum [ Upstream commit 296a193b06120aa6ae7cf5c0d7b5e5b55968026e ] syzkaller reported an URB that should have been killed to be active. We do not understand it, but this should fix the issue if it is real. Signed-off-by: Oliver Neukum Reported-by: syzbot+be5b5f86a162a6c281e6@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/20200507085806.5793-1-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/class/usblp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 07c3c3449147f..c578d64edc153 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -481,7 +481,8 @@ static int usblp_release(struct inode *inode, struct file *file) usb_autopm_put_interface(usblp->intf); if (!usblp->present) /* finish cleanup from disconnect */ - usblp_cleanup(usblp); + usblp_cleanup(usblp); /* any URBs must be dead */ + mutex_unlock(&usblp_mutex); return 0; } @@ -1397,9 +1398,11 @@ static void usblp_disconnect(struct usb_interface *intf) usblp_unlink_urbs(usblp); mutex_unlock(&usblp->mut); + usb_poison_anchored_urbs(&usblp->urbs); if (!usblp->used) usblp_cleanup(usblp); + mutex_unlock(&usblp_mutex); } -- 2.25.1