aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2023-09-07 11:41:01 +0200
committerCarlos Maiolino <cem@kernel.org>2023-09-07 11:55:50 +0200
commite17ccef351b424b11ddccc9d228d02a025f9639a (patch)
treeca8514ec142320b31e4f0847fa3b69fa9cb9eb78
parent39e9f4c2937a881293a1c5554a96197340a31879 (diff)
downloadxfsprogs-dev-e17ccef351b424b11ddccc9d228d02a025f9639a.tar.gz
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 <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
-rw-r--r--libxfs/xfs_da_format.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h
index b2362717c4..f9015f88ec 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 */