From 38a381a0bc57be2927c6744733ba274cefd13e9f Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 10 Jul 2024 15:57:09 -0700 Subject: affs: struct affs_head: Replace 1-element array with flexible array AFFS uses struct affs_head's "table" array as a flexible array. Switch this to a proper flexible array[1]. There are no sizeof() uses; struct affs_head is only ever uses via direct casts. No binary output differences were found after this change. Link: https://github.com/KSPP/linux/issues/79 [1] Reviewed-by: Gustavo A. R. Silva Signed-off-by: Kees Cook Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/affs/amigaffs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h index 81fb396d4dfa..0f739ea56293 100644 --- a/fs/affs/amigaffs.h +++ b/fs/affs/amigaffs.h @@ -80,7 +80,7 @@ struct affs_head { __be32 spare1; __be32 first_data; __be32 checksum; - __be32 table[1]; + __be32 table[]; }; struct affs_tail { -- cgit v1.2.3-70-g09d2 From e5f5ee827cda0933b46dacb123a53a58c1c656e8 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 10 Jul 2024 15:57:25 -0700 Subject: affs: struct affs_data_head: Replace 1-element array with flexible array Replace the deprecated[1] use of a 1-element array in struct affs_data_head with a modern flexible array. No binary differences are present after this conversion. Link: https://github.com/KSPP/linux/issues/79 [1] Reviewed-by: Gustavo A. R. Silva Signed-off-by: Kees Cook Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/affs/amigaffs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h index 0f739ea56293..8c91b6996893 100644 --- a/fs/affs/amigaffs.h +++ b/fs/affs/amigaffs.h @@ -119,7 +119,7 @@ struct affs_data_head __be32 size; __be32 next; __be32 checksum; - u8 data[1]; /* depends on block size */ + u8 data[]; /* depends on block size */ }; /* Permission bits */ -- cgit v1.2.3-70-g09d2 From 0aef1d41c61b52b21e1750e7b53447126ff257de Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 10 Jul 2024 15:57:34 -0700 Subject: affs: struct slink_front: Replace 1-element array with flexible array Replace the deprecated[1] use of a 1-element array in struct slink_front with a modern flexible array. No binary differences are present after this conversion. Link: https://github.com/KSPP/linux/issues/79 [1] Reviewed-by: Gustavo A. R. Silva Signed-off-by: Kees Cook Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/affs/amigaffs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h index 8c91b6996893..1b973a669d23 100644 --- a/fs/affs/amigaffs.h +++ b/fs/affs/amigaffs.h @@ -108,7 +108,7 @@ struct slink_front __be32 key; __be32 spare1[3]; __be32 checksum; - u8 symname[1]; /* depends on block size */ + u8 symname[]; /* depends on block size */ }; struct affs_data_head -- cgit v1.2.3-70-g09d2