From patchwork Mon Dec 14 03:41:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Can Guo X-Patchwork-Id: 343783 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 132DEC4361B for ; Mon, 14 Dec 2020 03:42:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4DA42389F for ; Mon, 14 Dec 2020 03:42:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438436AbgLNDmd (ORCPT ); Sun, 13 Dec 2020 22:42:33 -0500 Received: from labrats.qualcomm.com ([199.106.110.90]:1081 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438375AbgLNDmZ (ORCPT ); Sun, 13 Dec 2020 22:42:25 -0500 IronPort-SDR: CNPjLB8U2r0Fgtaiknb/rAw4D8FmB18qWG1Z+oI3KGyXu5dOre4CcWcBl+6zAoMIHjIG2/zobi w4UC+FvyojqDARC7BXatwLvL/BUO7/6iCowmpsLeiFB8Qjrv+uaNcy0AKCQeNpZQGxG8DqwhLi tR7kK7RDVtClPBmvM0pvp1cmu4iMFcOxY55vQKtDcZno5BSzyMxVv2i4PScUg354Yur6WwClkq WE/en/jSYD/ycr/DReIoEzW6ss31Mlv450WSca7GgluiL/vxQMc6jJjvtFueKK0fG0BjImswA2 w1A= X-IronPort-AV: E=Sophos;i="5.78,417,1599548400"; d="scan'208";a="47581862" Received: from unknown (HELO ironmsg-SD-alpha.qualcomm.com) ([10.53.140.30]) by labrats.qualcomm.com with ESMTP; 13 Dec 2020 19:41:39 -0800 X-QCInternal: smtphost Received: from wsp769891wss.qualcomm.com (HELO stor-presley.qualcomm.com) ([192.168.140.85]) by ironmsg-SD-alpha.qualcomm.com with ESMTP; 13 Dec 2020 19:41:38 -0800 Received: by stor-presley.qualcomm.com (Postfix, from userid 359480) id 9D20221216; Sun, 13 Dec 2020 19:41:38 -0800 (PST) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Stanley Chu , Bean Huo , Bart Van Assche , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 1/1] scsi: ufs: Fix a possible NULL pointer issue Date: Sun, 13 Dec 2020 19:41:32 -0800 Message-Id: <1607917296-11735-1-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org During system resume/suspend, hba could be NULL. In this case, do not touch eh_sem. Fixes: 88a92d6ae4fe ("scsi: ufs: Serialize eh_work with system PM events and async scan") Signed-off-by: Can Guo --- drivers/scsi/ufs/ufshcd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c1c401b..ef155a9 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8883,8 +8883,11 @@ int ufshcd_system_suspend(struct ufs_hba *hba) int ret = 0; ktime_t start = ktime_get(); + if (!hba) + return 0; + down(&hba->eh_sem); - if (!hba || !hba->is_powered) + if (!hba->is_powered) return 0; if ((ufs_get_pm_lvl_to_dev_pwr_mode(hba->spm_lvl) == @@ -8932,10 +8935,8 @@ int ufshcd_system_resume(struct ufs_hba *hba) int ret = 0; ktime_t start = ktime_get(); - if (!hba) { - up(&hba->eh_sem); + if (!hba) return -EINVAL; - } if (!hba->is_powered || pm_runtime_suspended(hba->dev)) /*