From: Tom Seewald <tseewald@gmail.com>
To: stable@vger.kernel.org
Cc: Shuah Khan <skhan@linuxfoundation.org>,
syzbot+a93fba6d384346a761e3@syzkaller.appspotmail.com,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tom Seewald <tseewald@gmail.com>,
Valentina Manea <valentina.manea.m@gmail.com>,
Shuah Khan <shuah@kernel.org>
Subject: [PATCH 4/4] usbip: synchronize event handler with sysfs code paths
Date: Fri, 16 Apr 2021 15:53:19 -0500 [thread overview]
Message-ID: <20210416205319.14075-4-tseewald@gmail.com> (raw)
In-Reply-To: <20210416205319.14075-1-tseewald@gmail.com>
From: Shuah Khan <skhan@linuxfoundation.org>
commit 363eaa3a450abb4e63bd6e3ad79d1f7a0f717814 upstream.
Fuzzing uncovered race condition between sysfs code paths in usbip
drivers. Device connect/disconnect code paths initiated through
sysfs interface are prone to races if disconnect happens during
connect and vice versa.
Use sysfs_lock to synchronize event handler with sysfs paths
in usbip drivers.
Cc: stable@vger.kernel.org # 4.9.x
Reported-and-tested-by: syzbot+a93fba6d384346a761e3@syzkaller.appspotmail.com
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/c5c8723d3f29dfe3d759cfaafa7dd16b0dfe2918.1616807117.git.skhan@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tom Seewald <tseewald@gmail.com>
---
drivers/usb/usbip/usbip_event.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index f8f7f3803a99..01eaae1f265b 100644
--- a/drivers/usb/usbip/usbip_event.c
+++ b/drivers/usb/usbip/usbip_event.c
@@ -84,6 +84,7 @@ static void event_handler(struct work_struct *work)
while ((ud = get_event()) != NULL) {
usbip_dbg_eh("pending event %lx\n", ud->event);
+ mutex_lock(&ud->sysfs_lock);
/*
* NOTE: shutdown must come first.
* Shutdown the device.
@@ -104,6 +105,7 @@ static void event_handler(struct work_struct *work)
ud->eh_ops.unusable(ud);
unset_event(ud, USBIP_EH_UNUSABLE);
}
+ mutex_unlock(&ud->sysfs_lock);
wake_up(&ud->eh_waitq);
}
--
2.20.1
next prev parent reply other threads:[~2021-04-16 20:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 20:53 [PATCH 1/4] usbip: add sysfs_lock to synchronize sysfs code paths Tom Seewald
2021-04-16 20:53 ` [PATCH 2/4] usbip: stub-dev " Tom Seewald
2021-04-16 21:44 ` Shuah Khan
2021-04-16 20:53 ` [PATCH 3/4] usbip: vudc " Tom Seewald
2021-04-16 21:45 ` Shuah Khan
2021-04-16 20:53 ` Tom Seewald [this message]
2021-04-16 21:45 ` [PATCH 4/4] usbip: synchronize event handler with " Shuah Khan
2021-04-16 21:43 ` [PATCH 1/4] usbip: add sysfs_lock to synchronize " Shuah Khan
2021-04-19 12:23 ` Greg Kroah-Hartman
2021-04-19 21:42 ` Shuah Khan
2021-04-20 7:30 ` Greg Kroah-Hartman
[not found] <cover.1616807117.git.skhan@linuxfoundation.org>
2021-03-30 1:36 ` [PATCH 4/4] usbip: synchronize event handler with " Shuah Khan
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=20210416205319.14075-4-tseewald@gmail.com \
--to=tseewald@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=syzbot+a93fba6d384346a761e3@syzkaller.appspotmail.com \
--cc=valentina.manea.m@gmail.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).