diff mbox series

drm/efidrm: ensure screen_base is initialized

Message ID 20250411125554.1453825-1-arnd@kernel.org (mailing list archive)
State New
Headers show
Series drm/efidrm: ensure screen_base is initialized | expand

Commit Message

Arnd Bergmann April 11, 2025, 12:55 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

clang points out that there is a code path that leads to undefined behavior:

drivers/gpu/drm/sysfb/efidrm.c:353:11: error: variable 'screen_base' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
  353 |         else if (mem_flags & EFI_MEMORY_WB)
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~

Add the missing initialization.

Fixes: 32ae90c66fb6 ("drm/sysfb: Add efidrm for EFI displays")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/sysfb/efidrm.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Javier Martinez Canillas April 11, 2025, 1:11 p.m. UTC | #1 
Arnd Bergmann <arnd@kernel.org> writes:

Hello Arnd,

> From: Arnd Bergmann <arnd@arndb.de>
>
> clang points out that there is a code path that leads to undefined behavior:
>
> drivers/gpu/drm/sysfb/efidrm.c:353:11: error: variable 'screen_base' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
>   353 |         else if (mem_flags & EFI_MEMORY_WB)
>       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Add the missing initialization.
>
> Fixes: 32ae90c66fb6 ("drm/sysfb: Add efidrm for EFI displays")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

A similar patch has been proposed by Nathan already and acked by Thomas:

https://lists.freedesktop.org/archives/dri-devel/2025-April/500539.html
Thomas Zimmermann April 11, 2025, 1:52 p.m. UTC | #2 
Hi Arnd

Am 11.04.25 um 15:11 schrieb Javier Martinez Canillas:
> Arnd Bergmann <arnd@kernel.org> writes:
>
> Hello Arnd,
>
>> From: Arnd Bergmann <arnd@arndb.de>

Thanks for the fix.

>>
>> clang points out that there is a code path that leads to undefined behavior:
>>
>> drivers/gpu/drm/sysfb/efidrm.c:353:11: error: variable 'screen_base' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
>>    353 |         else if (mem_flags & EFI_MEMORY_WB)
>>        |                  ^~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Add the missing initialization.
>>
>> Fixes: 32ae90c66fb6 ("drm/sysfb: Add efidrm for EFI displays")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
> A similar patch has been proposed by Nathan already and acked by Thomas:
>
> https://lists.freedesktop.org/archives/dri-devel/2025-April/500539.html

I've meanwhile merged this patch into drm-misc-next.

Best regards
Thomas

>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c
index af90064a4c04..85fc37c1e87a 100644
--- a/drivers/gpu/drm/sysfb/efidrm.c
+++ b/drivers/gpu/drm/sysfb/efidrm.c
@@ -353,6 +353,9 @@  static struct efidrm_device *efidrm_device_create(struct drm_driver *drv,
 	else if (mem_flags & EFI_MEMORY_WB)
 		screen_base = devm_memremap(&pdev->dev, mem->start, resource_size(mem),
 					    MEMREMAP_WB);
+	else
+		screen_base = NULL;
+
 	if (!screen_base)
 		return ERR_PTR(-ENOMEM);
 	iosys_map_set_vaddr_iomem(&sysfb->fb_addr, screen_base);