| Message ID | 20230522212949.never.283-kees@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | lkdtm/bugs: Switch from 1-element array to flexible array | expand |
On Mon, May 22, 2023 at 2:30 PM Kees Cook <keescook@chromium.org> wrote: > > The testing for ARRAY_BOUNDS just wants an uninstrumented array, > and the proper flexible array definition is fine for that. > > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Bill Wendling <morbo@google.com> > --- > drivers/misc/lkdtm/bugs.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c > index 48821f4c2b21..224f42cdddf2 100644 > --- a/drivers/misc/lkdtm/bugs.c > +++ b/drivers/misc/lkdtm/bugs.c > @@ -305,11 +305,10 @@ static void lkdtm_OVERFLOW_UNSIGNED(void) > ignored = value; > } > > -/* Intentionally using old-style flex array definition of 1 byte. */ > struct array_bounds_flex_array { > int one; > int two; > - char data[1]; > + char data[]; > }; > > struct array_bounds { > -- > 2.34.1 >
diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c index 48821f4c2b21..224f42cdddf2 100644 --- a/drivers/misc/lkdtm/bugs.c +++ b/drivers/misc/lkdtm/bugs.c @@ -305,11 +305,10 @@ static void lkdtm_OVERFLOW_UNSIGNED(void) ignored = value; } -/* Intentionally using old-style flex array definition of 1 byte. */ struct array_bounds_flex_array { int one; int two; - char data[1]; + char data[]; }; struct array_bounds {
The testing for ARRAY_BOUNDS just wants an uninstrumented array, and the proper flexible array definition is fine for that. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/misc/lkdtm/bugs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)