Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0D32C3A5A1 for ; Thu, 22 Aug 2019 17:22:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 793F2233FE for ; Thu, 22 Aug 2019 17:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494533; bh=4HEmr50nV+JdKeTKkivXpmrx6+cnqQ1AJCpc1pzNJLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HBvSnDdT8CxwHo2mWMyJs6nLn9kbgQ4acmitfZPlwsvFCnKY4n1SjFH0hGthDbbe8 Gld0a8XmxS7CDLnnCowO6esaRnEGt6ZIZrUzsuWAdSLpvPDFEq1vEO5bRZPJCDCrbZ cAF1UNparOY/8OeEJuBE9dPW+o75jnOcr92P+l2k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732134AbfHVRWN (ORCPT ); Thu, 22 Aug 2019 13:22:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:39922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730997AbfHVRWN (ORCPT ); Thu, 22 Aug 2019 13:22:13 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C7D9B21743; Thu, 22 Aug 2019 17:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494531; bh=4HEmr50nV+JdKeTKkivXpmrx6+cnqQ1AJCpc1pzNJLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zi1GyzBeSfm/XZ3oGIDTM+8aYz1zfXLQYDIhyVHQdXVjE4P1tIZT77giHB47oEn4c rEQ1lbVILZ6z3QotTxZIc2kXdQVfi3NsZRQlMj7JKksnm7Pjz0Le9TYzyVAANHo543 Ln8bP4tw+zW8j8PUOXeptlWhUZMfPJm8Cksn2T7o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+a64a382964bf6c71a9c0@syzkaller.appspotmail.com, Oliver Neukum Subject: [PATCH 4.4 01/78] usb: iowarrior: fix deadlock on disconnect Date: Thu, 22 Aug 2019 10:18:05 -0700 Message-Id: <20190822171832.078518051@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171832.012773482@linuxfoundation.org> References: <20190822171832.012773482@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Oliver Neukum commit c468a8aa790e0dfe0a7f8a39db282d39c2c00b46 upstream. We have to drop the mutex before we close() upon disconnect() as close() needs the lock. This is safe to do by dropping the mutex as intfdata is already set to NULL, so open() will fail. Fixes: 03f36e885fc26 ("USB: open disconnect race in iowarrior") Reported-by: syzbot+a64a382964bf6c71a9c0@syzkaller.appspotmail.com Cc: stable Signed-off-by: Oliver Neukum Link: https://lore.kernel.org/r/20190808092728.23417-1-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/iowarrior.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -898,19 +898,20 @@ static void iowarrior_disconnect(struct dev = usb_get_intfdata(interface); mutex_lock(&iowarrior_open_disc_lock); usb_set_intfdata(interface, NULL); + /* prevent device read, write and ioctl */ + dev->present = 0; minor = dev->minor; + mutex_unlock(&iowarrior_open_disc_lock); + /* give back our minor - this will call close() locks need to be dropped at this point*/ - /* give back our minor */ usb_deregister_dev(interface, &iowarrior_class); mutex_lock(&dev->mutex); /* prevent device read, write and ioctl */ - dev->present = 0; mutex_unlock(&dev->mutex); - mutex_unlock(&iowarrior_open_disc_lock); if (dev->opened) { /* There is a process that holds a filedescriptor to the device ,