From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2B105C3F2CD for ; Tue, 3 Mar 2020 02:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDCBE2166E for ; Tue, 3 Mar 2020 02:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583203897; bh=awzDN82KYJ5TGTZJjcvf3lRygd874USY6KRrUfyWfDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eWAnKWqJSCiP8GQ8pEkTEmwyqkGMvMxyEP4HCJunRqgLTEyMwI+xn81cF3emZRB5I H4/O9FkLtiCmd5145Zmkm+cunoo0DYcUtkouz9xhyZWo8UmFACvo4ew+tGnDU3igLW pA8QkDi7BrgdHN8e7rJ99sIpKqhYQAqYDYO1XOjE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728678AbgCCCvc (ORCPT ); Mon, 2 Mar 2020 21:51:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:47234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728207AbgCCCuY (ORCPT ); Mon, 2 Mar 2020 21:50:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68D2624697; Tue, 3 Mar 2020 02:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583203824; bh=awzDN82KYJ5TGTZJjcvf3lRygd874USY6KRrUfyWfDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uS71HujvIVKct9aryYw59UK3ZyOqljBeYMaCyq1kw4dQ1R8zROKEhZ71q+euO1NfQ UVe6xGxnAffNmUUt0nTW4ga1rIqEb9GC44MXsRcN2Z97NL0f5eabenW2U9u7v6N8c9 inxC2vCiTw2Yzb6n20++568jkmYAydvgoqGjjeX4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lars-Peter Clausen , Michal Nazarewicz , Alexandru Ardelean , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 02/11] usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags Date: Mon, 2 Mar 2020 21:50:12 -0500 Message-Id: <20200303025021.10754-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200303025021.10754-1-sashal@kernel.org> References: <20200303025021.10754-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Lars-Peter Clausen [ Upstream commit 43d565727a3a6fd24e37c7c2116475106af71806 ] ffs_aio_cancel() can be called from both interrupt and thread context. Make sure that the current IRQ state is saved and restored by using spin_{un,}lock_irq{save,restore}(). Otherwise undefined behavior might occur. Acked-by: Michal Nazarewicz Signed-off-by: Lars-Peter Clausen Signed-off-by: Alexandru Ardelean Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_fs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 4cb1355271ec4..9536c409a90d5 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -888,18 +888,19 @@ static int ffs_aio_cancel(struct kiocb *kiocb) { struct ffs_io_data *io_data = kiocb->private; struct ffs_epfile *epfile = kiocb->ki_filp->private_data; + unsigned long flags; int value; ENTER(); - spin_lock_irq(&epfile->ffs->eps_lock); + spin_lock_irqsave(&epfile->ffs->eps_lock, flags); if (likely(io_data && io_data->ep && io_data->req)) value = usb_ep_dequeue(io_data->ep, io_data->req); else value = -EINVAL; - spin_unlock_irq(&epfile->ffs->eps_lock); + spin_unlock_irqrestore(&epfile->ffs->eps_lock, flags); return value; } -- 2.20.1