`struct fileIdentDesc` is a flexible structure, which means that it
contains a flexible-array member at the bottom. This could potentially
lead to an overwrite of the objects following `fi` in `struct
udf_fileident_iter` at run-time.

Fix this by placing the declaration of object `fi` at the end of
`struct udf_fileident_iter`.

-Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
ready to enable it globally.

Fixes: d16076d9b684 ("udf: New directory iteration code")
Cc: sta...@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo...@kernel.org>
---
 fs/udf/udfdecl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 88692512a466..736f591abc89 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -93,11 +93,11 @@ struct udf_fileident_iter {
        sector_t loffset;               /* Block offset of 'pos' within above
                                         * extent */
        struct extent_position epos;    /* Position after the above extent */
-       struct fileIdentDesc fi;        /* Copied directory entry */
        uint8_t *name;                  /* Pointer to entry name */
        uint8_t *namebuf;               /* Storage for entry name in case
                                         * the name is split between two blocks
                                         */
+       struct fileIdentDesc fi;        /* Copied directory entry */
 };
 
 struct udf_vds_record {
-- 
2.34.1


Reply via email to