projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dbaab94
)
tty: Avoid the use of one-element arrays
author
Gustavo A. R. Silva
<gustavoars@kernel.org>
Thu, 23 Jul 2020 22:31:27 +0000
(17:31 -0500)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 29 Jul 2020 15:07:58 +0000
(17:07 +0200)
One-element arrays are being deprecated[1]. Replace the one-element arrays
with simple value types 'char reserved_char' and 'compat_int_t reserved'[2],
once it seems these are just placeholders for alignment.
[1] https://github.com/KSPP/linux/issues/79
[2] https://github.com/KSPP/linux/issues/86
Tested-by: kernel test robot <lkp@intel.com>
Link:
https://github.com/GustavoARSilva/linux-hardening/blob/master/cii/0-day/tty-20200716.md
Acked-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link:
https://lore.kernel.org/r/f49bf0e27eaac396c96d21392c8c284f9f5ef52a.1595543280.git.gustavoars@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/tty_io.c
patch
|
blob
|
history
diff --git
a/drivers/tty/tty_io.c
b/drivers/tty/tty_io.c
index 5a6f36b391d95d8662d82984f8842f3948545bca..3b6e5ec3ba548004d336d3c607b49836b6ccc308 100644
(file)
--- a/
drivers/tty/tty_io.c
+++ b/
drivers/tty/tty_io.c
@@
-2683,7
+2683,7
@@
struct serial_struct32 {
compat_int_t baud_base;
unsigned short close_delay;
char io_type;
- char reserved_char
[1]
;
+ char reserved_char;
compat_int_t hub6;
unsigned short closing_wait; /* time to wait before closing */
unsigned short closing_wait2; /* no longer used... */
@@
-2691,7
+2691,7
@@
struct serial_struct32 {
unsigned short iomem_reg_shift;
unsigned int port_high;
/* compat_ulong_t iomap_base FIXME */
- compat_int_t reserved
[1]
;
+ compat_int_t reserved;
};
static int compat_tty_tiocsserial(struct tty_struct *tty,