| Message ID | 1602787671-9497-1-git-send-email-bbhatt@codeaurora.org |
|---|---|
| State | Accepted |
| Commit | 9b627c25e70816a5e1dca940444b5029065b4d60 |
| Headers | show |
| Series | bus: mhi: core: Remove double locking from mhi_driver_remove() | expand |
On Thu, Oct 15, 2020 at 11:47:51AM -0700, Bhaumik Bhatt wrote: > There is double acquisition of the pm_lock from mhi_driver_remove() > function. Remove the read_lock_bh/read_unlock_bh calls for pm_lock > taken during a call to mhi_device_put() as the lock is acquired > within the function already. This will help avoid a potential > kernel panic. > > Fixes: 189ff97cca53 ("bus: mhi: core: Add support for data transfer") > Reported-by: Shuah Khan <skhan@linuxfoundation.org> > Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > --- > drivers/bus/mhi/core/init.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c > index 0ffdebd..0a09f82 100644 > --- a/drivers/bus/mhi/core/init.c > +++ b/drivers/bus/mhi/core/init.c > @@ -1276,10 +1276,8 @@ static int mhi_driver_remove(struct device *dev) > mutex_unlock(&mhi_chan->mutex); > } > > - read_lock_bh(&mhi_cntrl->pm_lock); > while (mhi_dev->dev_wake) > mhi_device_put(mhi_dev); > - read_unlock_bh(&mhi_cntrl->pm_lock); > > return 0; > } > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >
On Thu, Oct 15, 2020 at 11:47:51AM -0700, Bhaumik Bhatt wrote: > There is double acquisition of the pm_lock from mhi_driver_remove() > function. Remove the read_lock_bh/read_unlock_bh calls for pm_lock > taken during a call to mhi_device_put() as the lock is acquired > within the function already. This will help avoid a potential > kernel panic. > > Fixes: 189ff97cca53 ("bus: mhi: core: Add support for data transfer") > Reported-by: Shuah Khan <skhan@linuxfoundation.org> > Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org> Applied to mhi-next! Thanks, Mani > --- > drivers/bus/mhi/core/init.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c > index 0ffdebd..0a09f82 100644 > --- a/drivers/bus/mhi/core/init.c > +++ b/drivers/bus/mhi/core/init.c > @@ -1276,10 +1276,8 @@ static int mhi_driver_remove(struct device *dev) > mutex_unlock(&mhi_chan->mutex); > } > > - read_lock_bh(&mhi_cntrl->pm_lock); > while (mhi_dev->dev_wake) > mhi_device_put(mhi_dev); > - read_unlock_bh(&mhi_cntrl->pm_lock); > > return 0; > } > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Thu, 15 Oct 2020 11:47:51 -0700 you wrote: > There is double acquisition of the pm_lock from mhi_driver_remove() > function. Remove the read_lock_bh/read_unlock_bh calls for pm_lock > taken during a call to mhi_device_put() as the lock is acquired > within the function already. This will help avoid a potential > kernel panic. > > Fixes: 189ff97cca53 ("bus: mhi: core: Add support for data transfer") > Reported-by: Shuah Khan <skhan@linuxfoundation.org> > Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org> > > [...] Here is the summary with links: - bus: mhi: core: Remove double locking from mhi_driver_remove() https://git.kernel.org/qcom/c/9b627c25e708 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index 0ffdebd..0a09f82 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -1276,10 +1276,8 @@ static int mhi_driver_remove(struct device *dev) mutex_unlock(&mhi_chan->mutex); } - read_lock_bh(&mhi_cntrl->pm_lock); while (mhi_dev->dev_wake) mhi_device_put(mhi_dev); - read_unlock_bh(&mhi_cntrl->pm_lock); return 0; }
There is double acquisition of the pm_lock from mhi_driver_remove() function. Remove the read_lock_bh/read_unlock_bh calls for pm_lock taken during a call to mhi_device_put() as the lock is acquired within the function already. This will help avoid a potential kernel panic. Fixes: 189ff97cca53 ("bus: mhi: core: Add support for data transfer") Reported-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org> --- drivers/bus/mhi/core/init.c | 2 -- 1 file changed, 2 deletions(-)