diff options
| author | UCHINO Satoshi <satoshi.uchino@toshiba.co.jp> | 2013-05-23 11:10:11 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 18:19:01 -0700 |
| commit | ee093f6edc6ade788cb55a325dc42728c8b7f4d0 (patch) | |
| tree | 42b80f90afc2b3e6aab3d4c4a31ea85f46057eec | |
| parent | 4cd7c81bf4cf4297d478fd144e1e2c17f9eb5d20 (diff) | |
| download | linux-3.10-ee093f6edc6ade788cb55a325dc42728c8b7f4d0.tar.gz linux-3.10-ee093f6edc6ade788cb55a325dc42728c8b7f4d0.tar.bz2 linux-3.10-ee093f6edc6ade788cb55a325dc42728c8b7f4d0.zip | |
usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed
commit d68c277b501889b3a50c179d1c3d704db7947b83 upstream.
Without this memory barrier, the file-storage thread may fail to
escape from the following while loop, because it may observe new
common->thread_wakeup_needed and old bh->state which are updated by
the callback functions.
/* Wait for the CBW to arrive */
while (bh->state != BUF_STATE_FULL) {
rc = sleep_thread(common);
if (rc)
return rc;
}
Signed-off-by: UCHINO Satoshi <satoshi.uchino@toshiba.co.jp>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index cb8c162cae5..6de57600b54 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -511,6 +511,7 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep) /* Caller must hold fsg->lock */ static void wakeup_thread(struct fsg_common *common) { + smp_wmb(); /* ensure the write of bh->state is complete */ /* Tell the main thread that something has happened */ common->thread_wakeup_needed = 1; if (common->thread_task) @@ -730,6 +731,7 @@ static int sleep_thread(struct fsg_common *common) } __set_current_state(TASK_RUNNING); common->thread_wakeup_needed = 0; + smp_rmb(); /* ensure the latest bh->state is visible */ return rc; } |