m68k: Avoid VLA use in mangle_kernel_stack()
Geert Uytterhoeven
maintainerPATCH 1/1 m68k: Avoid VLA use in mangle_kernel_stack()
With gcc 7.3.0:
arch/m68k/kernel/signal.c: In function ‘mangle_kernel_stack’:
arch/m68k/kernel/signal.c:654:3: warning: ISO C90 forbids variable length array ‘buf’ [-Wvla]
unsigned long buf[fsize / 2]; /* yes, twice as much */
^~~~~~~~
Replace the variable size by the upper limit, which is 168 bytes.
--- arch/m68k/kernel/signal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/m68k/kernel/signal.c +2 -1
@@ -651,7 +651,8 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec, regs->vector = formatvec &0xfff ; }else {struct switch_stack *sw = (struct switch_stack *)regs -1 ; -unsigned long buf[fsize /2 ];/* yes, twice as much */ +/* yes, twice as much as max(sizeof(frame.un.fmt<x>)) */ +unsigned long buf[sizeof (((struct frame *)0 )->un) /2 ];/* that'll make sure that expansion won't crap over data */ if (copy_from_user (buf + fsize /4 , fp, fsize))
Signature · 1 line
2.17.1
Quoted 11 lines · Geert Uytterhoeven
With gcc 7.3.0:
arch/m68k/kernel/signal.c: In function ‘mangle_kernel_stack’:
arch/m68k/kernel/signal.c:654:3: warning: ISO C90 forbids variable length array ‘buf’ [-Wvla]
unsigned long buf[fsize / 2]; /* yes, twice as much */
^~~~~~~~Replace the variable size by the upper limit, which is 168 bytes.
Signed-off-by Geert Uytterhoeven <[email protected]>
I also have a couple of build warning fixes for m68k that I might post in the next few days, for stuff that I ran into while testing my y2038 series.
Arnd
Quoted 10 lines · Geert Uytterhoeven
With gcc 7.3.0:
arch/m68k/kernel/signal.c: In function ‘mangle_kernel_stack’:
arch/m68k/kernel/signal.c:654:3: warning: ISO C90 forbids variable length array ‘buf’ [-Wvla]
unsigned long buf[fsize / 2]; /* yes, twice as much */
^~~~~~~~Replace the variable size by the upper limit, which is 168 bytes.
Signed-off-by Geert Uytterhoeven <[email protected]>
Thanks, applied and queued for v5.1.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds