bcachefs: Annotate struct bch_xattr with __counted_by()

[PATCH] bcachefs: Annotate struct bch_xattr with __counted_by()

Thorsten Blum posted 1 patch 1 year, 3 months ago

Download mbox

fs/bcachefs/xattr_format.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] bcachefs: Annotate struct bch_xattr with __counted_by()

Posted by Thorsten Blum 1 year, 3 months ago

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>
---
 fs/bcachefs/xattr_format.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/xattr_format.h b/fs/bcachefs/xattr_format.h
index e9f810539552..c7916011ef34 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 */
-- 
2.46.0

Re: [PATCH] bcachefs: Annotate struct bch_xattr with __counted_by()

Posted by Kent Overstreet 1 year, 3 months ago

On Sat, Aug 24, 2024 at 03:57:41PM GMT, Thorsten Blum wrote:
> 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>

Applied