From patchwork Mon Oct 9 08:45:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 9992291 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7734960230 for ; Mon, 9 Oct 2017 08:43:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69ACA28724 for ; Mon, 9 Oct 2017 08:43:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E60A28726; Mon, 9 Oct 2017 08:43:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0736828724 for ; Mon, 9 Oct 2017 08:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750930AbdJIInd (ORCPT ); Mon, 9 Oct 2017 04:43:33 -0400 Received: from m12-14.163.com ([220.181.12.14]:35428 "EHLO m12-14.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750795AbdJIInd (ORCPT ); Mon, 9 Oct 2017 04:43:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=5pHDuvjBl0fr4In/n/ PZKCjE3TgL7+tZ0i2Zra/SZdQ=; b=n6j7WiT85/DbgyCAru50hJRtaWxyhNuv5+ K4a79ZNhU7Mcb8qmOIjn6jeuuitBmuGDIli9cbmEYwEx66W//SAJRIUnrGtehnms COOx0aileBSy+qWocBy6qUTlvLBoTQBPYV5i8pVJF2aG3UljfdugJWMofuz3rdqN bGGr64GQ0= Received: from bai-oslab.tsinghua.edu.cn (unknown [166.111.70.46]) by smtp10 (Coremail) with SMTP id DsCowAAX9KihNttZQvofIg--.45949S2; Mon, 09 Oct 2017 16:43:16 +0800 (CST) From: Jia-Ju Bai To: forest@alittletooquiet.net, gregkh@linuxfoundation.org, simon@nikanor.nu, tvboxspy@gmail.com, scott@matheina.com, dan.a.cashman@gmail.com, golubev.mikhail@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend Date: Mon, 9 Oct 2017 16:45:55 +0800 Message-Id: <1507538755-10217-1-git-send-email-baijiaju1990@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: DsCowAAX9KihNttZQvofIg--.45949S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7XryfCw18tFy5Zw4rAF15CFg_yoWkJFc_uw n2v3yxXrWYvrsIyFn5Ar43Zry0vaySqrWxuw4vqa1FyFW3Aa4kur4DXF9xXrn8WF47XFy7 ZrnFqr1Fkr1jyjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1byCtUUUUU== X-Originating-IP: [166.111.70.46] X-CM-SenderInfo: xedlyx5dmximizq6il2tof0z/1tbiGARselXlb1PMVwAAsd Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver may sleep under a spinlock, and the function call path is: vt6655_suspend (acquire the spinlock) pci_set_power_state __pci_start_power_transition (drivers/pci/pci.c) msleep --> may sleep To fix it, pci_set_power_state is called without having a spinlock. This bug is found by my static analysis tool and my code review. Signed-off-by: Jia-Ju Bai --- drivers/staging/vt6655/device_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 9fcf2e2..1123b4f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state) MACbShutdown(priv); pci_disable_device(pcid); - pci_set_power_state(pcid, pci_choose_state(pcid, state)); spin_unlock_irqrestore(&priv->lock, flags); + pci_set_power_state(pcid, pci_choose_state(pcid, state)); + return 0; }