diff mbox series

vt: Replace 0-length array with flexible array

Message ID 20230105220549.never.529-kees@kernel.org
State New
Headers
Series vt: Replace 0-length array with flexible array |

Commit Message

Kees Cook Jan. 5, 2023, 10:05 p.m. UTC 
  Zero-length arrays are deprecated[1]. Replace struct uni_screen's
"lines" 0-length array with a flexible array. Detected with GCC 13,
using -fstrict-flex-arrays=3:

../drivers/tty/vt/vt.c: In function 'vc_uniscr_copy_area':
../drivers/tty/vt/vt.c:488:48: warning: array subscript dst_row is outside array bounds of 'char32_t *[0]' {aka 'unsigned int *[]'} [-Warray-bounds=]
  488 |                 char32_t *dst_line = dst->lines[dst_row];
      |                                      ~~~~~~~~~~^~~~~~~~~
../drivers/tty/vt/vt.c:335:19: note: while referencing 'lines'
  335 |         char32_t *lines[0];
      |                   ^~~~~

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/tty/vt/vt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Slaby Jan. 9, 2023, 12:03 p.m. UTC | #1 
On 05. 01. 23, 23:05, Kees Cook wrote:
> Zero-length arrays are deprecated[1]. Replace struct uni_screen's
> "lines" 0-length array with a flexible array. Detected with GCC 13,
> using -fstrict-flex-arrays=3:
> 
> ../drivers/tty/vt/vt.c: In function 'vc_uniscr_copy_area':
> ../drivers/tty/vt/vt.c:488:48: warning: array subscript dst_row is outside array bounds of 'char32_t *[0]' {aka 'unsigned int *[]'} [-Warray-bounds=]
>    488 |                 char32_t *dst_line = dst->lines[dst_row];
>        |                                      ~~~~~~~~~~^~~~~~~~~
> ../drivers/tty/vt/vt.c:335:19: note: while referencing 'lines'
>    335 |         char32_t *lines[0];
>        |                   ^~~~~
> 
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays
> 
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jirislaby@kernel.org>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
> Cc: Helge Deller <deller@gmx.de>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>   drivers/tty/vt/vt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
> index 981d2bfcf9a5..b1445f00f616 100644
> --- a/drivers/tty/vt/vt.c
> +++ b/drivers/tty/vt/vt.c
> @@ -332,7 +332,7 @@ typedef uint32_t char32_t;
>    * scrolling only implies some pointer shuffling.
>    */
>   struct uni_screen {
> -	char32_t *lines[0];
> +	DECLARE_FLEX_ARRAY(char32_t *, lines);
>   };

Perhaps I am missing something, but why don't we simply have:
   char32_t **uni_screen_lines;
? And even if we don't, we should likely convert to array_size() on the 
alloc site.

And a side note: what's actually the purpose of all that 
NO_VC_UNI_SCREEN and closely connected get_vc_uniscr()?

thanks,
diff mbox series

Patch

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 981d2bfcf9a5..b1445f00f616 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -332,7 +332,7 @@  typedef uint32_t char32_t;
  * scrolling only implies some pointer shuffling.
  */
 struct uni_screen {
-	char32_t *lines[0];
+	DECLARE_FLEX_ARRAY(char32_t *, lines);
 };
 
 static struct uni_screen *vc_uniscr_alloc(unsigned int cols, unsigned int rows)