xfs: check that dir block entries don't off the end of the buffer
PATCH 1/1 xfs: check that dir block entries don't off the end of the buffer
When we're checking the entries in a directory buffer, make sure that the entry length doesn't push us off the end of the buffer. Found via xfs/388 writing ones to the freetag length field and xfs_repair crashing.
--- fs/xfs/libxfs/xfs_dir2_data.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/xfs/libxfs/xfs_dir2_data.c +4 -0
@@ -136,6 +136,8 @@ __xfs_dir3_data_check(*/ if (be16_to_cpu (dup->freetag) ==XFS_DIR2_DATA_FREE_TAG ) {XFS_WANT_CORRUPTED_RETURN (mp, lastfree ==0 ); +XFS_WANT_CORRUPTED_RETURN (mp, endp >= + p +be16_to_cpu (dup->length));XFS_WANT_CORRUPTED_RETURN (mp,be16_to_cpu (*xfs_dir2_data_unused_tag_p (dup)) == (char *)dup - (char *)hdr);
@@ -164,6 +166,8 @@ __xfs_dir3_data_check(XFS_WANT_CORRUPTED_RETURN (mp, dep->namelen !=0 );XFS_WANT_CORRUPTED_RETURN (mp, !xfs_dir_ino_validate (mp,be64_to_cpu (dep->inumber))); +XFS_WANT_CORRUPTED_RETURN (mp, endp >= + p + ops->data_entsize (dep->namelen));XFS_WANT_CORRUPTED_RETURN (mp,be16_to_cpu (*ops->data_entry_tag_p (dep)) == (char *)dep - (char *)hdr);
Quoted 14 lines · Darrick J. Wong
When we're checking the entries in a directory buffer, make sure that the entry length doesn't push us off the end of the buffer. Found via xfs/388 writing ones to the freetag length field and
xfs_repaircrashing.Signed-off-by Darrick J. Wong <[email protected]>--- fs/xfs/libxfs/xfs_dir2_data.c | 4 ++++ 1 file changed, 4 insertions(+)fs/xfs/libxfs/xfs_dir2_data.c +0
-0
fs/xfs/libxfs/xfs_dir2_data.c __xfs_dir3_data_check( · line 140
Quoted 5 lines
fs/xfs/libxfs/xfs_dir2_data.c +2
-0@@ -136,6 +136,8 @@ __xfs_dir3_data_check(*/ if (be16_to_cpu (dup->freetag) ==XFS_DIR2_DATA_FREE_TAG ) {XFS_WANT_CORRUPTED_RETURN (mp, lastfree ==0 ); +XFS_WANT_CORRUPTED_RETURN (mp, endp >= + p +be16_to_cpu (dup->length));
FWIW, the rest of the code seems to use the dup/dep pointers for verification and explicitly casts to char * where necessary. I don't see that it really matters, so:
Quoted 16 lines
fs/xfs/libxfs/xfs_dir2_data.c +2
-1XFS_WANT_CORRUPTED_RETURN (mp,be16_to_cpu (*xfs_dir2_data_unused_tag_p (dup)) == (char *)dup - (char *)hdr);@@ -164,6 +166,8 @@ __xfs_dir3_data_check(XFS_WANT_CORRUPTED_RETURN (mp, dep->namelen !=0 );XFS_WANT_CORRUPTED_RETURN (mp, !xfs_dir_ino_validate (mp,be64_to_cpu (dep->inumber))); +XFS_WANT_CORRUPTED_RETURN (mp, endp >= + p + ops->data_entsize (dep->namelen));XFS_WANT_CORRUPTED_RETURN (mp,be16_to_cpu (*ops->data_entry_tag_p (dep)) == (char *)dep - (char *)hdr); --To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html