| Message ID | 1455544758-7718-1-git-send-email-jonathanh@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 15-02-16, 13:59, Jon Hunter wrote: > Commit 6a0712f6f199 ("PM / OPP: Add dev_pm_opp_set_rate()") causes a > crash on Tegra124 Jetson TK1 when using the DFLL clock source for the > CPU. The DFLL manages the voltage itself and so there is no regulator > specified for the OPPs and so we get a crash when we try to dereference > the regulator pointer. Fix this by checking to see if the regulator > IS_ERR_OR_NULL before dereferencing it. > > Fixes: 6a0712f6f199 ("PM / OPP: Add dev_pm_opp_set_rate()") > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > > I am not sure why I did not catch this instance of the bug last week > when I submitted the patch to fix the NULL pointer dereference in > _opp_supported_by_regulators(). May be I forgot to go back and test > on HEAD after bisecting? Anyway, both this fix and the one from last > week are necessary to get the kernel booting again on Tegra124 Jetson > TK1. I want to fix it a bit differently, will send out in a different mail to make it easy for Rafael to apply it.
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index d7cd4e265766..82ad5ae72427 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -564,7 +564,7 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg, int ret; /* Regulator not available for device */ - if (IS_ERR(reg)) { + if (IS_ERR_OR_NULL(reg)) { dev_dbg(dev, "%s: regulator not available: %ld\n", __func__, PTR_ERR(reg)); return 0;
Commit 6a0712f6f199 ("PM / OPP: Add dev_pm_opp_set_rate()") causes a crash on Tegra124 Jetson TK1 when using the DFLL clock source for the CPU. The DFLL manages the voltage itself and so there is no regulator specified for the OPPs and so we get a crash when we try to dereference the regulator pointer. Fix this by checking to see if the regulator IS_ERR_OR_NULL before dereferencing it. Fixes: 6a0712f6f199 ("PM / OPP: Add dev_pm_opp_set_rate()") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- I am not sure why I did not catch this instance of the bug last week when I submitted the patch to fix the NULL pointer dereference in _opp_supported_by_regulators(). May be I forgot to go back and test on HEAD after bisecting? Anyway, both this fix and the one from last week are necessary to get the kernel booting again on Tegra124 Jetson TK1. drivers/base/power/opp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)