Skip to content

Commit 5d521a3

Browse files
computersforpeacechanwoochoi
authored andcommitted
PM / devfreq: rk3399_dmc: Avoid static (reused) profile
This static struct can get reused if the device gets removed/reprobed, and that causes use-after-free in its ->freq_table. Let's just move the struct to our dynamic allocation. Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
1 parent cb178a9 commit 5d521a3

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/devfreq/rk3399_dmc.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
struct rk3399_dmcfreq {
3939
struct device *dev;
4040
struct devfreq *devfreq;
41+
struct devfreq_dev_profile profile;
4142
struct devfreq_simple_ondemand_data ondemand_data;
4243
struct clk *dmc_clk;
4344
struct devfreq_event_dev *edev;
@@ -228,13 +229,6 @@ static int rk3399_dmcfreq_get_cur_freq(struct device *dev, unsigned long *freq)
228229
return 0;
229230
}
230231

231-
static struct devfreq_dev_profile rk3399_devfreq_dmc_profile = {
232-
.polling_ms = 200,
233-
.target = rk3399_dmcfreq_target,
234-
.get_dev_status = rk3399_dmcfreq_get_dev_status,
235-
.get_cur_freq = rk3399_dmcfreq_get_cur_freq,
236-
};
237-
238232
static __maybe_unused int rk3399_dmcfreq_suspend(struct device *dev)
239233
{
240234
struct rk3399_dmcfreq *dmcfreq = dev_get_drvdata(dev);
@@ -422,10 +416,16 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
422416
data->volt = dev_pm_opp_get_voltage(opp);
423417
dev_pm_opp_put(opp);
424418

425-
rk3399_devfreq_dmc_profile.initial_freq = data->rate;
419+
data->profile = (struct devfreq_dev_profile) {
420+
.polling_ms = 200,
421+
.target = rk3399_dmcfreq_target,
422+
.get_dev_status = rk3399_dmcfreq_get_dev_status,
423+
.get_cur_freq = rk3399_dmcfreq_get_cur_freq,
424+
.initial_freq = data->rate,
425+
};
426426

427427
data->devfreq = devm_devfreq_add_device(dev,
428-
&rk3399_devfreq_dmc_profile,
428+
&data->profile,
429429
DEVFREQ_GOV_SIMPLE_ONDEMAND,
430430
&data->ondemand_data);
431431
if (IS_ERR(data->devfreq)) {

0 commit comments

Comments
 (0)