Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d230eb authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: verify dirblocklog correctly 



sb_dirblklog is added to sb_blocklog to compute the directory block size
in bytes.  Therefore, we must compare the sum of both those values
against XFS_MAX_BLOCKSIZE_LOG, not just dirblklog.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent d2b3964a

fs/xfs/libxfs/xfs_sb.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ xfs_mount_validate_sb( 
	    sbp->sb_blocklog < XFS_MIN_BLOCKSIZE_LOG			||

	    sbp->sb_blocklog > XFS_MAX_BLOCKSIZE_LOG			||

	    sbp->sb_blocksize != (1 << sbp->sb_blocklog)		||

	    sbp->sb_dirblklog > XFS_MAX_BLOCKSIZE_LOG			||

	    sbp->sb_dirblklog + sbp->sb_blocklog > XFS_MAX_BLOCKSIZE_LOG ||

	    sbp->sb_inodesize < XFS_DINODE_MIN_SIZE			||

	    sbp->sb_inodesize > XFS_DINODE_MAX_SIZE			||

	    sbp->sb_inodelog < XFS_DINODE_MIN_LOG			||