[v2] ext4: Annotate struct fname with __counted_by()

Commit Message

Thorsten Blum Nov. 5, 2024, 10:18 a.m. UTC

Add the __counted_by compiler attribute to the flexible array member
name to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.

Reviewed-by: Jan Kara <[e-mail]>
Signed-off-by: Thorsten Blum <[e-mail]>
---
Changes in v2:
- Split the patch into two separate patches as suggested by Greg KH
- Link to v1: https://lore.kernel.org/r/[e-mail]/
---
 fs/ext4/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o Nov. 14, 2024, 1:53 p.m. UTC | #1

On Tue, 05 Nov 2024 11:18:14 +0100, Thorsten Blum wrote:
> Add the __counted_by compiler attribute to the flexible array member
> name to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
> 
> 

Applied, thanks!

[1/1] ext4: Annotate struct fname with __counted_by()
      commit: de183b2baf90f0acc1854a3998c14b8b228f9643

By the way, in general, you don't need to resend patches unless you
need to rebase them to fix patch conflicts; I track requested patches
using patchwork, and I tend to process and review patches in batches.

If you are concerned that I might have missed a patch, feel free to
reply to the original patch with a ping.  I'll see it in my inbox, and
even if it had gotten lost in my inbox, I can find the original patch
using lore.kernel.org or patchwork.

Thanks!


Best regards,

Thorsten Blum Nov. 14, 2024, 11:01 p.m. UTC | #2

On 14. Nov 2024, at 14:53, Theodore Ts'o wrote:
> By the way, in general, you don't need to resend patches unless you
> need to rebase them to fix patch conflicts; I track requested patches
> using patchwork, and I tend to process and review patches in batches.
> 
> If you are concerned that I might have missed a patch, feel free to
> reply to the original patch with a ping.  I'll see it in my inbox, and
> even if it had gotten lost in my inbox, I can find the original patch
> using lore.kernel.org or patchwork.

Thanks for letting me know.

Best regards,
Thorsten

Patch

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index ef6a3c8f3a9a..233479647f1b 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -418,7 +418,7 @@  struct fname {
 	__u32		inode;
 	__u8		name_len;
 	__u8		file_type;
-	char		name[];
+	char		name[] __counted_by(name_len);
 };
 
 /*