From: Alan Stern <stern@rowland.harvard.edu>
To: Oliver Neukum <oliver@neukum.org>
Cc: andreyknvl@google.com, <syzkaller-bugs@googlegroups.com>,
<gregkh@linuxfoundation.org>,
syzbot <syzbot+7bbcbe9c9ff0cd49592a@syzkaller.appspotmail.com>,
USB list <linux-usb@vger.kernel.org>
Subject: Re: possible deadlock in iowarrior
Date: Thu, 8 Aug 2019 13:43:36 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.44L0.1908081334580.1319-100000@iolanthe.rowland.org> (raw)
In-Reply-To: <1565187142.15973.3.camel@neukum.org>
On Wed, 7 Aug 2019, Oliver Neukum wrote:
> > PS: syzbot reported a similar lock inversion problem (involving two
> > mutexes rather than just one) in drivers/usb/misc/iowarrior.c.
> > Probably the two drivers need similar fixes.
>
> No, but I got a fix.
>
> Regards
> Oliver
>
> From 973e82b3f583113e4d7fe5cd2f918a16022c4e38 Mon Sep 17 00:00:00 2001
> From: Oliver Neukum <oneukum@suse.com>
> Date: Tue, 6 Aug 2019 16:17:54 +0200
> Subject: [PATCH] usb: iowarrior: fix deadlock on disconnect
>
> 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
> Signed-off-by: Oliver Neukum <oneukum@suse.com>
> ---
> drivers/usb/misc/iowarrior.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
> index ba05dd80a020..f5bed9f29e56 100644
> --- a/drivers/usb/misc/iowarrior.c
> +++ b/drivers/usb/misc/iowarrior.c
> @@ -866,19 +866,20 @@ static void iowarrior_disconnect(struct usb_interface *interface)
> 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*/
Ungrammatical and untrue: usb_deregister_dev() does not call close().
>
> - /* 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);
That part looks weird. The critical section is empty, except for a
comment. Maybe you meant to lock dev->mutex around the assignment to
dev->present above?
In any case, this driver still seems to have at least one unnecessary
mutex. Look at the locking mess in iowarrior_open().
Alan Stern
prev parent reply other threads:[~2019-08-08 17:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1565187142.15973.3.camel@neukum.org>
2019-08-08 14:33 ` possible deadlock in open_rio Alan Stern
2019-08-08 14:33 ` syzbot
2019-08-08 14:33 ` syzbot
2019-08-08 14:44 ` Andrey Konovalov
2019-08-08 17:34 ` [PATCH] USB: rio500: Fix lockdep violation Alan Stern
2019-08-08 17:58 ` Greg KH
2019-08-08 18:23 ` Alan Stern
2019-08-15 12:48 ` Greg KH
2019-08-15 14:47 ` Alan Stern
2019-09-03 18:18 ` Greg KH
2019-08-19 11:51 ` Oliver Neukum
2019-08-08 17:43 ` Alan Stern [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.44L0.1908081334580.1319-100000@iolanthe.rowland.org \
--to=stern@rowland.harvard.edu \
--cc=andreyknvl@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=syzbot+7bbcbe9c9ff0cd49592a@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).