| Message ID | 20201125054255.137067-1-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 39014ce6d6028614a46395923a2c92d058b6fa87 |
| Headers | show |
| Series | slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI | expand |
On 25/11/2020 05:42, Bjorn Andersson wrote: > Attempting to send a power request during PM operations, when the QMI > handle isn't initialized results in a NULL pointer dereference. So check > if the QMI handle has been initialized before attempting to post the > power requests. > > Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Applied thanks, --srini
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Tue, 24 Nov 2020 21:42:55 -0800 you wrote: > Attempting to send a power request during PM operations, when the QMI > handle isn't initialized results in a NULL pointer dereference. So check > if the QMI handle has been initialized before attempting to post the > power requests. > > Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > [...] Here is the summary with links: - slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI https://git.kernel.org/qcom/c/39014ce6d602 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index d8decb345e9d..c502e9e93965 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1229,6 +1229,9 @@ static int qcom_slim_ngd_runtime_resume(struct device *dev) struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); int ret = 0; + if (!ctrl->qmi.handle) + return 0; + if (ctrl->state >= QCOM_SLIM_NGD_CTRL_ASLEEP) ret = qcom_slim_ngd_power_up(ctrl); if (ret) { @@ -1616,6 +1619,9 @@ static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev) struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); int ret = 0; + if (!ctrl->qmi.handle) + return 0; + ret = qcom_slim_qmi_power_request(ctrl, false); if (ret && ret != -EBUSY) dev_info(ctrl->dev, "slim resource not idle:%d\n", ret);
Attempting to send a power request during PM operations, when the QMI handle isn't initialized results in a NULL pointer dereference. So check if the QMI handle has been initialized before attempting to post the power requests. Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/slimbus/qcom-ngd-ctrl.c | 6 ++++++ 1 file changed, 6 insertions(+)