On Thu, Feb 07, 2019 at 10:56:32AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Use xfs_verify_magic to check the magic numbers of inodes.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_inode_buf.c | 6 +++++-
> fs/xfs/xfs_log_recover.c | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 01ebc9557f69..f92f14e93ad3 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -97,7 +97,7 @@ xfs_inode_buf_verify(
>
> dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog));
> unlinked_ino = be32_to_cpu(dip->di_next_unlinked);
> - di_ok = dip->di_magic == cpu_to_be16(XFS_DINODE_MAGIC) &&
> + di_ok = xfs_verify_magic(bp, dip->di_magic) &&
> xfs_dinode_good_version(mp, dip->di_version) &&
> xfs_verify_agino_or_null(mp, agno, unlinked_ino);
> if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
> @@ -146,12 +146,16 @@ xfs_inode_buf_write_verify(
>
> const struct xfs_buf_ops xfs_inode_buf_ops = {
> .name = "xfs_inode",
> + .magic = { cpu_to_be16(XFS_DINODE_MAGIC),
> + cpu_to_be16(XFS_DINODE_MAGIC) },
> .verify_read = xfs_inode_buf_read_verify,
> .verify_write = xfs_inode_buf_write_verify,
> };
>
> const struct xfs_buf_ops xfs_inode_buf_ra_ops = {
> .name = "xfs_inode_ra",
> + .magic = { cpu_to_be16(XFS_DINODE_MAGIC),
> + cpu_to_be16(XFS_DINODE_MAGIC) },
> .verify_read = xfs_inode_buf_readahead_verify,
> .verify_write = xfs_inode_buf_write_verify,
> };
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 5ad42d598333..f5948d16015b 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3049,7 +3049,7 @@ xlog_recover_inode_pass2(
> * Make sure the place we're flushing out to really looks
> * like an inode!
> */
> - if (unlikely(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC))) {
> + if (unlikely(!xfs_verify_magic(bp, dip->di_magic))) {
> xfs_alert(mp,
> "%s: Bad inode magic number, dip = "PTR_FMT", dino bp = "PTR_FMT", ino = %Ld",
> __func__, dip, bp, in_f->ilf_ino);
