| Message ID | 1471337498-6382-1-git-send-email-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On 二, 2016-08-16 at 10:51 +0200, LABBE Corentin wrote: > of_match_device could return NULL, and so cause a NULL pointer > dereference later at line 472: > data->socdata = of_id->data; > > For fixing this problem, we use of_device_get_match_data(), this will > simplify the code a little by using a standard function for > getting the match data. > > Reported-by: coverity (CID 1324128) > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> patch applied. thanks, rui > --- > drivers/thermal/imx_thermal.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/thermal/imx_thermal.c > b/drivers/thermal/imx_thermal.c > index c5547bd..e473548b 100644 > --- a/drivers/thermal/imx_thermal.c > +++ b/drivers/thermal/imx_thermal.c > @@ -471,8 +471,6 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match); > > static int imx_thermal_probe(struct platform_device *pdev) > { > - const struct of_device_id *of_id = > - of_match_device(of_imx_thermal_match, &pdev->dev); > struct imx_thermal_data *data; > struct regmap *map; > int measure_freq; > @@ -490,7 +488,7 @@ static int imx_thermal_probe(struct > platform_device *pdev) > } > data->tempmon = map; > > - data->socdata = of_id->data; > + data->socdata = of_device_get_match_data(&pdev->dev); > > /* make sure the IRQ flag is clear before enabling irq on > i.MX6SX */ > if (data->socdata->version == TEMPMON_IMX6SX) { -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c5547bd..e473548b 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -471,8 +471,6 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match); static int imx_thermal_probe(struct platform_device *pdev) { - const struct of_device_id *of_id = - of_match_device(of_imx_thermal_match, &pdev->dev); struct imx_thermal_data *data; struct regmap *map; int measure_freq; @@ -490,7 +488,7 @@ static int imx_thermal_probe(struct platform_device *pdev) } data->tempmon = map; - data->socdata = of_id->data; + data->socdata = of_device_get_match_data(&pdev->dev); /* make sure the IRQ flag is clear before enabling irq on i.MX6SX */ if (data->socdata->version == TEMPMON_IMX6SX) {
of_match_device could return NULL, and so cause a NULL pointer dereference later at line 472: data->socdata = of_id->data; For fixing this problem, we use of_device_get_match_data(), this will simplify the code a little by using a standard function for getting the match data. Reported-by: coverity (CID 1324128) Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> --- drivers/thermal/imx_thermal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)