video: Remove stack VLA usage
PATCH 4/4 video: Remove stack VLA usage
The kernel would like to have all stack VLA usage removed[1]. The arrays are fixed here (declared with a const variable) but they appear like VLAs to the compiler. We can use a pre-processor define to fix the warning.
[1]: https://lkml.org/lkml/2018/3/7/621
--- drivers/video/fbdev/via/via_aux_sii164.c | 8 +++++--- drivers/video/fbdev/via/via_aux_vt1631.c | 11 +++++++---- drivers/video/fbdev/via/via_aux_vt1632.c | 11 +++++++---- drivers/video/fbdev/via/via_aux_vt1636.c | 11 +++++++---- 4 files changed, 26 insertions(+), 15 deletions(-)
drivers/video/fbdev/via/via_aux_sii164.c +5 -3
@@ -27,6 +27,9 @@static const char *name ="SiI 164 PanelLink Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }; +#define VIA_SII164_LEN ARRAY_SIZE(id)static void probe (struct via_aux_bus *bus,u8 addr) {
@@ -34,9 +37,8 @@ static void probe(struct via_aux_bus *bus, u8 addr) .bus = bus, .addr = addr, .name = name}; -/* check vendor id and device id */ -const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }, len =ARRAY_SIZE (id); -u8 tmp[len]; +u8 tmp[VIA_SII164_LEN ]; +int len =VIA_SII164_LEN ;if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len))return ;
drivers/video/fbdev/via/via_aux_vt1631.c +7 -4
@@ -27,16 +27,19 @@static const char *name ="VT1631 LVDS Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x06 ,0x11 ,0x91 ,0x31 }, len =ARRAY_SIZE (id); +#define VIA_VT1631_LEN ARRAY_SIZE(id)void via_aux_vt1631_probe (struct via_aux_bus *bus) {struct via_aux_drv drv = { .bus = bus, .addr =0x38 , - .name = name}; -/* check vendor id and device id */ -const u8 id[] = {0x06 ,0x11 ,0x91 ,0x31 }, len =ARRAY_SIZE (id); -u8 tmp[len]; + .name = name + }; +u8 tmp[VIA_VT1631_LEN ]; +int len =VIA_VT1631_LEN ;if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len))return ;
drivers/video/fbdev/via/via_aux_vt1632.c +7 -4
@@ -27,16 +27,19 @@static const char *name ="VT1632 DVI Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x06 ,0x11 ,0x92 ,0x31 }; +#define VIA_VT1632_LEN ARRAY_SIZE(id)static void probe (struct via_aux_bus *bus,u8 addr) {struct via_aux_drv drv = { .bus = bus, .addr = addr, - .name = name}; -/* check vendor id and device id */ -const u8 id[] = {0x06 ,0x11 ,0x92 ,0x31 }, len =ARRAY_SIZE (id); -u8 tmp[len]; + .name = name + }; +u8 tmp[VIA_VT1632_LEN ]; +int len =VIA_VT1632_LEN ;if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len))return ;
drivers/video/fbdev/via/via_aux_vt1636.c +7 -4
@@ -27,16 +27,19 @@static const char *name ="VT1636 LVDS Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x06 ,0x11 ,0x45 ,0x33 }; +#define VIA_VT1636_LEN ARRAY_SIZE(id)void via_aux_vt1636_probe (struct via_aux_bus *bus) {struct via_aux_drv drv = { .bus = bus, .addr =0x40 , - .name = name}; -/* check vendor id and device id */ -const u8 id[] = {0x06 ,0x11 ,0x45 ,0x33 }, len =ARRAY_SIZE (id); -u8 tmp[len]; + .name = name + }; +u8 tmp[VIA_VT1636_LEN ]; +int len =VIA_VT1636_LEN ;if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len))return ;
Signature · 1 line
2.7.4
Quoted 4 lines · Tobin C. Harding
The kernel would like to have all stack VLA usage removed[1]. The arrays are fixed here (declared with a const variable) but they appear like VLAs to the compiler. We can use a pre-processor define to fix the warning.
[]
drivers/video/fbdev/via/via_aux_sii164.c
Quoted 1 line
drivers/video/fbdev/via/via_aux_sii164.c +0
-0
[]
drivers/video/fbdev/via/via_aux_sii164.c line 31
Quoted 6 lines
drivers/video/fbdev/via/via_aux_sii164.c +2
-0@@ -27,6 +27,9 @@static const char *name ="SiI 164 PanelLink Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 };
It seems id is now global in multiple places.
Perhaps these should be static.
drivers/video/fbdev/via/via_aux_vt1631.c
Quoted 1 line
drivers/video/fbdev/via/via_aux_vt1631.c +0
-0
[]
drivers/video/fbdev/via/via_aux_vt1631.c line 31
Quoted 6 lines
drivers/video/fbdev/via/via_aux_vt1631.c +2
-0@@ -27,16 +27,19 @@static const char *name ="VT1631 LVDS Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x06 ,0x11 ,0x91 ,0x31 }, len =ARRAY_SIZE (id);
etc...
Quoted 10 lines · Joe Perches
Quoted 4 lines · Tobin C. Harding
The kernel would like to have all stack VLA usage removed[1]. The arrays are fixed here (declared with a const variable) but they appear like VLAs to the compiler. We can use a pre-processor define to fix the warning.
[]
drivers/video/fbdev/via/via_aux_sii164.c
Quoted 1 line
drivers/video/fbdev/via/via_aux_sii164.c +0
-0[]
Quoted 2 lines
drivers/video/fbdev/via/via_aux_sii164.c +0
-0@@ -27,6 +27,9 @@
Quoted 7 lines
drivers/video/fbdev/via/via_aux_sii164.c line 31
Quoted 4 lines
drivers/video/fbdev/via/via_aux_sii164.c +2
-0static const char *name ="SiI 164 PanelLink Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 };It seems id is now global in multiple places.
Perhaps these should be static.
woops, thanks Joe. Will fix and re-spin.
Quoted 11 lines
drivers/video/fbdev/via/via_aux_vt1631.c
Quoted 2 lines
drivers/video/fbdev/via/via_aux_vt1631.c +0
-0[]
drivers/video/fbdev/via/via_aux_vt1631.c line 31
Quoted 6 lines
drivers/video/fbdev/via/via_aux_vt1631.c +2
-0@@ -27,16 +27,19 @@static const char *name ="VT1631 LVDS Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x06 ,0x11 ,0x91 ,0x31 }, len =ARRAY_SIZE (id);etc...
thanks,
Tobin.
Quoted 10 lines · Joe Perches
Quoted 4 lines · Tobin C. Harding
The kernel would like to have all stack VLA usage removed[1]. The arrays are fixed here (declared with a const variable) but they appear like VLAs to the compiler. We can use a pre-processor define to fix the warning.
[]
drivers/video/fbdev/via/via_aux_sii164.c
Quoted 1 line
drivers/video/fbdev/via/via_aux_sii164.c +0
-0[]
Quoted 2 lines
drivers/video/fbdev/via/via_aux_sii164.c +0
-0@@ -27,6 +27,9 @@
Quoted 7 lines
drivers/video/fbdev/via/via_aux_sii164.c line 31
Quoted 4 lines
drivers/video/fbdev/via/via_aux_sii164.c +2
-0static const char *name ="SiI 164 PanelLink Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 };It seems id is now global in multiple places.
Perhaps these should be static.
Does it even need to be global? Why not just get rid of the indirection and use ARRAY_SIZE where we mean it? This seems to work for me,
drivers/video/fbdev/via/via_aux_sii164.c +3 -3
@@ -35,10 +35,10 @@ static void probe(struct via_aux_bus *bus, u8 addr) .addr = addr, .name = name};/* check vendor id and device id */ -const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }, len =ARRAY_SIZE (id); -u8 tmp[len]; +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }; +u8 tmp[ARRAY_SIZE (id)]; -if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len)) +if (!via_aux_read (&drv,0x00 , tmp,sizeof (tmp)) ||memcmp (id, tmp,sizeof (tmp)))return ;printk (KERN_INFO "viafb: Found %s at address 0x%x\n" , name, addr);
Cheers,
Tycho
I sent a patch for this six hours ago:
https://patchwork.kernel.org/patch/10268591/
--
Gustavo
Quoted 45 lines · Tycho Andersen
Quoted 10 lines · Joe Perches
Quoted 4 lines · Tobin C. Harding
The kernel would like to have all stack VLA usage removed[1]. The arrays are fixed here (declared with a const variable) but they appear like VLAs to the compiler. We can use a pre-processor define to fix the warning.
[]
drivers/video/fbdev/via/via_aux_sii164.c
Quoted 1 line
drivers/video/fbdev/via/via_aux_sii164.c +0
-0[]
Quoted 2 lines
drivers/video/fbdev/via/via_aux_sii164.c +0
-0@@ -27,6 +27,9 @@Quoted 7 lines
drivers/video/fbdev/via/via_aux_sii164.c line 31
Quoted 4 lines
drivers/video/fbdev/via/via_aux_sii164.c +2
-0static const char *name ="SiI 164 PanelLink Transmitter" ; +/* check vendor id and device id */ +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 };It seems id is now global in multiple places.
Perhaps these should be static.Does it even need to be global? Why not just get rid of the indirection and use
ARRAY_SIZEwhere we mean it? This seems to work for me,drivers/video/fbdev/via/via_aux_sii164.c +3
-3@@ -35,10 +35,10 @@ static void probe(struct via_aux_bus *bus, u8 addr) .addr = addr, .name = name};/* check vendor id and device id */ -const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }, len =ARRAY_SIZE (id); -u8 tmp[len]; +const u8 id[] = {0x01 ,0x00 ,0x06 ,0x00 }; +u8 tmp[ARRAY_SIZE (id)]; -if (!via_aux_read (&drv,0x00 , tmp, len) ||memcmp (id, tmp, len)) +if (!via_aux_read (&drv,0x00 , tmp,sizeof (tmp)) ||memcmp (id, tmp,sizeof (tmp)))return ;printk (KERN_INFO "viafb: Found %s at address 0x%x\n" , name, addr);Cheers,
Tycho
Quoted 7 lines · Gustavo A. R. Silva
I sent a patch for this six hours ago:
https://patchwork.kernel.org/patch/10268591/
--
Gustavo
lol, I knew there would be a race on to fix these :) And you got it right, bonus points. Let's drop this one then.
thanks,
Tobin.