Skip to contentSkip to conversation

drm/msm: return early when allocating fbdev fails

PATCH In review Tom Rix 3 participants 3 messages Feb 22, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/msm: return early when allocating fbdev fails

building with clang and W=1 reports drivers/gpu/drm/msm/msm_fbdev.c:144:6: error: variable 'helper' is used
uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!fbdev)

      ^~~~~~

helper is only initialized after fbdev succeeds, so is in a garbage state at the fail: label. There is nothing to unwinded if fbdev alloaction fails, return NULL.

Fixes 3fb1f62f80a1 ("drm/fb-helper: Remove drm_fb_helper_unprepare() from drm_fb_helper_fini()")
---
 drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_fbdev.c +1 -1
index c804e5ba682a..c1356aff87da 100644
@@ -142,7 +142,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
 
 	fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
 	if (!fbdev)
-		goto fail;
+		return NULL;
 
 	helper = &fbdev->base;
 
Signature · 1 line
2.27.0
#1 lore raw

Hi

Am 22.02.23 um 16:56 schrieb Tom Rix:

Quoted 4 lines

building with clang and W=1 reports drivers/gpu/drm/msm/msm_fbdev.c:144:6: error: variable 'helper' is used
uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!fbdev)

Quoted 8 lines
       ^~~~~~

helper is only initialized after fbdev succeeds, so is in a garbage state at the fail: label. There is nothing to unwinded if fbdev alloaction fails, return NULL.

Fixes 3fb1f62f80a1 ("drm/fb-helper: Remove drm_fb_helper_unprepare() from drm_fb_helper_fini()")

Already fixed here: https://lore.kernel.org/dri-devel/[email protected]/T/#t

Best regards
Thomas

Quoted 17 lines
---
  drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_fbdev.c +1 -1
index c804e5ba682a..c1356aff87da 100644
@@ -142,7 +142,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
 
  	fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
  	if (!fbdev)
-		goto fail;
+		return NULL;
 
  	helper = &fbdev->base;
 
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
#2 lore raw
Quoted 9 lines · Thomas Zimmermann

Hi

Am 22.02.23 um 16:56 schrieb Tom Rix:

Quoted 6 lines

building with clang and W=1 reports drivers/gpu/drm/msm/msm_fbdev.c:144:6: error: variable 'helper' is used
uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!fbdev)

       ^~~~~~
Quoted 8 lines
Quoted 6 lines

helper is only initialized after fbdev succeeds, so is in a garbage state at the fail: label. There is nothing to unwinded if fbdev alloaction fails, return NULL.

Fixes 3fb1f62f80a1 ("drm/fb-helper: Remove drm_fb_helper_unprepare() from drm_fb_helper_fini()")

Already fixed here: https://lore.kernel.org/dri-devel/[email protected]/T/#t

There is also:

../drivers/gpu/drm/omapdrm/omap_fbdev.c:235:6: error: variable 'helper' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]

        if (!fbdev)
            ^~~~~~
../drivers/gpu/drm/omapdrm/omap_fbdev.c:259:26: note: uninitialized use occurs here
        drm_fb_helper_unprepare(helper);
                                ^~~~~~
../drivers/gpu/drm/omapdrm/omap_fbdev.c:235:2: note: remove the 'if' if its condition is always false
        if (!fbdev)
        ^~~~~~~~~~~
../drivers/gpu/drm/omapdrm/omap_fbdev.c:228:30: note: initialize the variable 'helper' to silence this warning
        struct drm_fb_helper *helper;
                                    ^
                                     = NULL

1 error generated.

Is the fix the same as the one you have linked above?

Cheers,
Nathan