From: Thorsten Blum <thorsten.blum@toblux.com>
Date: Sat, 24 Aug 2024 13:57:41 +0000 (+0200)
Subject: bcachefs: Annotate struct bch_xattr with __counted_by()
X-Git-Tag: v6.12-rc1~101^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86e92eeeb237;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Annotate struct bch_xattr with __counted_by()

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

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/xattr_format.h b/fs/bcachefs/xattr_format.h
index e9f810539552e..c7916011ef34d 100644
--- a/fs/bcachefs/xattr_format.h
+++ b/fs/bcachefs/xattr_format.h
@@ -13,7 +13,7 @@ struct bch_xattr {
 	__u8			x_type;
 	__u8			x_name_len;
 	__le16			x_val_len;
-	__u8			x_name[];
+	__u8			x_name[] __counted_by(x_name_len);
 } __packed __aligned(8);
 
 #endif /* _BCACHEFS_XATTR_FORMAT_H */