Skip to contentSkip to conversation

fs/affs: struct slink_front: Replace 1-element array with flexible array

PATCH In review Kees Cook 3 participants 4 messages Jul 10, 2024 – Jul 11, 2024

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 fs/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.

---
Cc: David Sterba <[email protected]>
Cc: [email protected]

---
 fs/affs/amigaffs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/affs/amigaffs.h +1 -1
index 81fb396d4dfa..5509fbc98bc0 100644
@@ -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
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Kees Cook

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.

Thanks

Signature · 1 line
Gustavo
Quoted 21 lines

---
Cc: David Sterba <[email protected]>
Cc: [email protected]

---
  fs/affs/amigaffs.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/affs/amigaffs.h +1 -1
index 81fb396d4dfa..5509fbc98bc0 100644
@@ -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
#2 lore raw
In reply to Kees Cook
Quoted 7 lines · Kees Cook

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.

Thanks, I've added the 3 patches to my tree. I've noticed there's one more 1-element array in struct affs_root_head (hashtable):

https://elixir.bootlin.com/linux/latest/source/fs/affs/amigaffs.h#L50

The struct is used only partially by AFFS_ROOT_HEAD from affs_fill_super and not accessing the hashtable. This could have been missed by the tools you use or was the conversion intentionally skipped?

author
#3 lore raw
Quoted 10 lines · David Sterba
Quoted 7 lines · Kees Cook

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.

Thanks, I've added the 3 patches to my tree.

Thanks!

Quoted 8 lines

I've noticed there's one
more 1-element array in struct affs_root_head (hashtable):

https://elixir.bootlin.com/linux/latest/source/fs/affs/amigaffs.h#L50

The struct is used only partially by AFFS_ROOT_HEAD from affs_fill_super and not accessing the hashtable. This could have been missed by the tools you use or was the conversion intentionally skipped?

Yeah -- this was intentional. We wanted to finish conversion of members that were actually being used by the kernel. There is a lot of UAPI and "all possible data structures" structs declared in the kernel that we were wading through only to find they weren't actually being used.

That said, I'm happy to send a patch to convert hashtable -- it's not used so it can't break anything. ;)

Signature · 1 line
Kees Cook