Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935157Ab3GSC2T (ORCPT ); Thu, 18 Jul 2013 22:28:19 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:37828 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935121Ab3GSCZF (ORCPT ); Thu, 18 Jul 2013 22:25:05 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, UCHINO Satoshi , Michal Nazarewicz , Felipe Balbi Subject: [ 07/24] usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed Date: Thu, 18 Jul 2013 19:24:39 -0700 Message-Id: <20130719022404.517193108@linuxfoundation.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <20130719022404.015008451@linuxfoundation.org> References: <20130719022404.015008451@linuxfoundation.org> User-Agent: quilt/0.60-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1741 Lines: 54 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: UCHINO Satoshi 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 Acked-by: Michal Nazarewicz Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/f_mass_storage.c | 2 ++ 1 file changed, 2 insertions(+) --- 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 * /* 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_commo } __set_current_state(TASK_RUNNING); common->thread_wakeup_needed = 0; + smp_rmb(); /* ensure the latest bh->state is visible */ return rc; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/