diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2019-06-23 20:50:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 10:12:57 +0300 |
| commit | 44c92c0c7407b150f50af0c063ddb54c91df3c84 (patch) | |
| tree | e4fa72bcd9a0bf1532869e7d918f15a5396d5aed /drivers | |
| parent | 068e5e7ea6268a3705157916452420b5bc9961a5 (diff) | |
| download | linux-44c92c0c7407b150f50af0c063ddb54c91df3c84.tar.xz | |
opp: Don't use IS_ERR on invalid supplies
commit 560d1bcad715c215e7ffe5d7cffe045974b623d0 upstream.
_set_opp_custom() receives a set of OPP supplies as its arguments and
the caller of it passes NULL when the supplies are not valid. But
_set_opp_custom(), by mistake, checks for error by performing
IS_ERR(old_supply) on it which will always evaluate to false.
The problem was spotted during of testing of upcoming update for the
NVIDIA Tegra CPUFreq driver.
Cc: stable <stable@vger.kernel.org>
Fixes: 7e535993fa4f ("OPP: Separate out custom OPP handler specific code")
Reported-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
[ Viresh: Massaged changelog ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/opp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 0420f7e8ad5b..f5d565804e52 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -631,7 +631,7 @@ static int _set_opp_custom(const struct opp_table *opp_table, data->old_opp.rate = old_freq; size = sizeof(*old_supply) * opp_table->regulator_count; - if (IS_ERR(old_supply)) + if (!old_supply) memset(data->old_opp.supplies, 0, size); else memcpy(data->old_opp.supplies, old_supply, size); |