| Message ID | 20200702160540.24546-1-novikov@ispras.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fbdev: da8xx-fb: go to proper label on error handling paths in probe | expand |
On 7/2/20 6:05 PM, Evgeny Novikov wrote: > fb_probe() can successfully allocate a new frame buffer, but then fail > to perform some operations with regulator. In these cases fb_probe() > goes to label err_pm_runtime_disable where the frame buffer is not > released. The patch makes fb_probe() to go to label err_release_fb on > corresponding error handling paths. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Evgeny Novikov <novikov@ispras.ru> Applied to drm-misc-next tree, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/video/fbdev/da8xx-fb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c > index 73c3c4c8cc12..e38c0e3f9c61 100644 > --- a/drivers/video/fbdev/da8xx-fb.c > +++ b/drivers/video/fbdev/da8xx-fb.c > @@ -1402,14 +1402,14 @@ static int fb_probe(struct platform_device *device) > if (IS_ERR(par->lcd_supply)) { > if (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) { > ret = -EPROBE_DEFER; > - goto err_pm_runtime_disable; > + goto err_release_fb; > } > > par->lcd_supply = NULL; > } else { > ret = regulator_enable(par->lcd_supply); > if (ret) > - goto err_pm_runtime_disable; > + goto err_release_fb; > } > > fb_videomode_to_var(&da8xx_fb_var, lcdc_info); >
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c index 73c3c4c8cc12..e38c0e3f9c61 100644 --- a/drivers/video/fbdev/da8xx-fb.c +++ b/drivers/video/fbdev/da8xx-fb.c @@ -1402,14 +1402,14 @@ static int fb_probe(struct platform_device *device) if (IS_ERR(par->lcd_supply)) { if (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) { ret = -EPROBE_DEFER; - goto err_pm_runtime_disable; + goto err_release_fb; } par->lcd_supply = NULL; } else { ret = regulator_enable(par->lcd_supply); if (ret) - goto err_pm_runtime_disable; + goto err_release_fb; } fb_videomode_to_var(&da8xx_fb_var, lcdc_info);
fb_probe() can successfully allocate a new frame buffer, but then fail to perform some operations with regulator. In these cases fb_probe() goes to label err_pm_runtime_disable where the frame buffer is not released. The patch makes fb_probe() to go to label err_release_fb on corresponding error handling paths. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov <novikov@ispras.ru> --- drivers/video/fbdev/da8xx-fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)