From e17ccef351b424b11ddccc9d228d02a025f9639a Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 7 Sep 2023 11:41:01 +0200 Subject: [PATCH] xfs: convert flex-array declarations in xfs attr shortform objects Source kernel commit: f6250e205691a58c81be041b1809a2e706852641 As of 6.5-rc1, UBSAN trips over the ondisk extended attribute shortform definitions using an array length of 1 to pretend to be a flex array. Kernel compilers have to support unbounded array declarations, so let's correct this. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Kees Cook Signed-off-by: Carlos Maiolino --- libxfs/xfs_da_format.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h index b2362717c..f9015f88e 100644 --- a/libxfs/xfs_da_format.h +++ b/libxfs/xfs_da_format.h @@ -591,7 +591,7 @@ struct xfs_attr_shortform { uint8_t valuelen; /* actual length of value (no NULL) */ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ uint8_t nameval[]; /* name & value bytes concatenated */ - } list[1]; /* variable sized array */ + } list[]; /* variable sized array */ }; typedef struct xfs_attr_leaf_map { /* RLE map of free bytes */ -- 2.47.3