Skip to contentSkip to conversation

drm/kmb: fix array bounds warning

PATCH In review Arnd Bergmann 3 participants 3 messages Nov 29, 2020 – Dec 5, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/kmb: fix array bounds warning

From: Arnd Bergmann <[email protected]>

gcc warns about an out-of-bounds access when the using nonzero values for 'plane_id' on kmb->plane_status:

drivers/gpu/drm/kmb/kmb_plane.c: In function 'kmb_plane_atomic_disable':
drivers/gpu/drm/kmb/kmb_plane.c:128:20: warning: array subscript 3 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]

  128 |   kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
      |   ~~~~~~~~~~~~~~~~~^~~~~~~~~~
drivers/gpu/drm/kmb/kmb_plane.c:125:20: warning: array subscript 2 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]
  125 |   kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
      |   ~~~~~~~~~~~~~~~~~^~~~~~~~~~

drivers/gpu/drm/kmb/kmb_plane.c:122:20: warning: array subscript 1 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]
122 | kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;

Having the array truncated to one entry seems intentional, so add a range check before indexing it to make it clearer what is going on and shut up the warning.

I received the warning from the kernel test robot after a private patch that turns on Warray-bounds unconditionally.

Fixes 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display")
---
 drivers/gpu/drm/kmb/kmb_plane.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/kmb/kmb_plane.c +3 -0
index 8448d1edb553..be8eea3830c1 100644
@@ -114,6 +114,9 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,
 
 	kmb = to_kmb(plane->dev);
 
+	if (WARN_ON(plane_id >= KMB_MAX_PLANES))
+		return;
+
 	switch (plane_id) {
 	case LAYER_0:
 		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
Signature · 6 lines
2.27.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Arnd,
Thanks for your patch.

Quoted 48 lines

-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Sunday, November 29, 2020 12:09 PM
To: Chrisanthus, Anitha <[email protected]>; Dea, Edmund J <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Sam Ravnborg <[email protected]>
Cc: Arnd Bergmann <[email protected]>; lkp <[email protected]>; dri- [email protected]; [email protected]
Subject: [PATCH] drm/kmb: fix array bounds warning

From: Arnd Bergmann <[email protected]>

gcc warns about an out-of-bounds access when the using nonzero values for 'plane_id' on kmb->plane_status:

drivers/gpu/drm/kmb/kmb_plane.c: In function 'kmb_plane_atomic_disable':
drivers/gpu/drm/kmb/kmb_plane.c:128:20: warning: array subscript 3 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]

  128 |   kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
      |   ~~~~~~~~~~~~~~~~~^~~~~~~~~~
drivers/gpu/drm/kmb/kmb_plane.c:125:20: warning: array subscript 2 is
above array bounds of 'struct layer_status[1]' [-Warray-bounds]
  125 |   kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
      |   ~~~~~~~~~~~~~~~~~^~~~~~~~~~

drivers/gpu/drm/kmb/kmb_plane.c:122:20: warning: array subscript 1 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]
122 | kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;

Having the array truncated to one entry seems intentional, so add a range check before indexing it to make it clearer what is going on and shut up the warning.

I received the warning from the kernel test robot after a private patch that turns on Warray-bounds unconditionally.

Fixes 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display")
---
 drivers/gpu/drm/kmb/kmb_plane.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/kmb/kmb_plane.c +0 -0
index 8448d1edb553..be8eea3830c1 100644

drivers/gpu/drm/kmb/kmb_plane.c static void kmb_plane_atomic_disable(struct · line 120

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c +3 -0
@@ -114,6 +114,9 @@ static void kmb_plane_atomic_disable(struct
 drm_plane *plane,
 
 	kmb = to_kmb(plane->dev);
 
+	if (WARN_ON(plane_id >= KMB_MAX_PLANES))
+		return;
+

Looks good.

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c +0 -0
 	switch (plane_id) {
 	case LAYER_0:

kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
--
2.27.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw

Hi Anitha,

Quoted 17 lines · Anitha

Hi Arnd,
Thanks for your patch.

Quoted 14 lines

-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Sunday, November 29, 2020 12:09 PM
To: Chrisanthus, Anitha <[email protected]>; Dea, Edmund J <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Sam Ravnborg <[email protected]>
Cc: Arnd Bergmann <[email protected]>; lkp <[email protected]>; dri- [email protected]; [email protected]
Subject: [PATCH] drm/kmb: fix array bounds warning

From: Arnd Bergmann <[email protected]>

gcc warns about an out-of-bounds access when the using nonzero values for 'plane_id' on kmb->plane_status:

...

Quoted 3 lines

Looks good.

You wanted a little time to get comforable with dim, so I picked up this patch and pushed it to drm-misc-next.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel