xfs: use xfs_ialloc_blks_per_cluster in xfs_imap
PATCH 5/5 xfs: use xfs_ialloc_blks_per_cluster in xfs_imap
From: Jie Liu <[email protected]>
Use xfs_ialloc_blks_per_cluster() in xfs_imap(). Please note that we previously calculate the number of blocks per cluster without taking the situation of that the inode cluster size might be equal to or less than the SB blocksize into account. Maybe there is a chance to cause potential issues after handling an untrusted inode number lookup and proceed to check if the inode number maps to a block is outsides the file system bounds or not.
--- fs/xfs/xfs_ialloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/xfs/xfs_ialloc.c +2 -3
@@ -1377,8 +1377,7 @@ xfs_imap(return XFS_ERROR (EINVAL ); } - blks_per_cluster =XFS_INODE_CLUSTER_SIZE (mp) >> mp->m_sb.sb_blocklog; - + blks_per_cluster =xfs_ialloc_blks_per_cluster (mp);/* * For bulkstat and handle lookups, we have an untrusted inode number * that we have to verify is valid. We cannot do this just by reading
@@ -1398,7 +1397,7 @@ xfs_imap(* If the inode cluster size is the same as the blocksize or * smaller we get to the buffer by simple arithmetics. */ -if (XFS_INODE_CLUSTER_SIZE (mp) <= mp->m_sb.sb_blocksize) { +if (blks_per_cluster ==1 ) { offset =XFS_INO_TO_OFFSET (mp, ino);ASSERT (offset < mp->m_sb.sb_inopblock);
Signature · 6 lines
1.8.3.2 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 9 lines · Jeff Liu
From: Jie Liu <[email protected]>
Use
xfs_ialloc_blks_per_cluster()inxfs_imap(). Please note that we previously calculate the number of blocks per cluster without taking the situation of that the inode cluster size might be equal to or less than the SB blocksize into account. Maybe there is a chance to cause potential issues after handling an untrusted inode number lookup and proceed to check if the inode number maps to a block is outsides the file system bounds or not.
I don't think there's any issues here - after all the inode lookups and mapping is done, the code in xfs_imap checks that the cluster that the inode is mapped to lies wholly within the filesystem boundaries. Hence I think you can remove that from the patch descritpion.
Otherwise, looks good.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Dave Chinner
Quoted 9 lines · Jeff Liu
From: Jie Liu <[email protected]>
Use
xfs_ialloc_blks_per_cluster()inxfs_imap(). Please note that we previously calculate the number of blocks per cluster without taking the situation of that the inode cluster size might be equal to or less than the SB blocksize into account. Maybe there is a chance to cause potential issues after handling an untrusted inode number lookup and proceed to check if the inode number maps to a block is outsides the file system bounds or not.
Quoted 5 lines
I don't think there's any issues here - after all the inode lookups and mapping is done, the code in
xfs_imapchecks that the cluster that the inode is mapped to lies wholly within the filesystem boundaries. Hence I think you can remove that from the patch descritpion.
Ah, you're right because the current logic can handle it well if blks_per_cluster > 1, or there is no influence to calculate the cluster_agbno if blks_per_cluster == 1. :)
Thanks,
-Jeff
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs