mirror of
https://github.com/torvalds/linux.git
synced 2026-09-12 04:23:03 +02:00
opp: fix use after free in _update_opp_table_clk()
dev_pm_opp_put_opp_table() frees the opp_table which is subsquently used
by dev_err_probe(). This causes an Oops during boot on gs101-oriole.
cpu cpu0: error 000000006b6b6b6b: Couldn't find clock
Unable to handle kernel paging request at virtual address 006b6b6b6b6b6cd3
...
Hardware name: Oriole (DT)
pstate: 00400005 (nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : _of_add_table_indexed+0x80/0xbb0
lr : _of_add_table_indexed+0x6c/0xbb0
...
Call trace:
_of_add_table_indexed+0x80/0xbb0 (P)
dev_pm_opp_of_cpumask_add_table+0x70/0x120
dt_cpufreq_probe+0x23c/0x480
platform_probe+0x64/0xb8
Fixes: 84f05af097 ("opp: Use clk_get_optional() to avoid leaving opp_table->clk as an error pointer")
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
[ Viresh: use return value of dev_err_probe() ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
parent
a5096d4927
commit
1f6de65e33
|
|
@ -1581,6 +1581,8 @@ static struct opp_table *_update_opp_table_clk(struct device *dev,
|
|||
struct opp_table *opp_table,
|
||||
bool getclk)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* Return early if we don't need to get clk or we have already done it
|
||||
* earlier.
|
||||
|
|
@ -1607,9 +1609,9 @@ static struct opp_table *_update_opp_table_clk(struct device *dev,
|
|||
opp_table->clk = clk_get_optional(dev, NULL);
|
||||
|
||||
if (IS_ERR(opp_table->clk)) {
|
||||
ret = dev_err_probe(dev, PTR_ERR(opp_table->clk), "Couldn't find clock\n");
|
||||
dev_pm_opp_put_opp_table(opp_table);
|
||||
dev_err_probe(dev, PTR_ERR(opp_table->clk), "Couldn't find clock\n");
|
||||
return ERR_CAST(opp_table->clk);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
if (opp_table->clk)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user