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

Commit 41ff715a authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Ensure bulkstat from an invalid inode number gets caught always with 


EINVAL.

SGI-PV: 953819
SGI-Modid: xfs-linux-melb:xfs-kern:26629a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent b2ea401b

fs/xfs/xfs_inode.c

+10 −7
Original line number Diff line number Diff line
@@ -334,10 +334,9 @@ xfs_itobp( 
#if !defined(__KERNEL__)

	ni = 0;

#elif defined(DEBUG)

	ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 :

		(BBTOB(imap.im_len) >> mp->m_sb.sb_inodelog);

	ni = BBTOB(imap.im_len) >> mp->m_sb.sb_inodelog;

#else	/* usual case */

	ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 : 1;

	ni = 1;

#endif



	for (i = 0; i < ni; i++) {
@@ -348,10 +347,14 @@ xfs_itobp( 
					(i << mp->m_sb.sb_inodelog));

		di_ok = INT_GET(dip->di_core.di_magic, ARCH_CONVERT) == XFS_DINODE_MAGIC &&

			    XFS_DINODE_GOOD_VERSION(INT_GET(dip->di_core.di_version, ARCH_CONVERT));

		if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP,

		if (unlikely(XFS_TEST_ERROR(!di_ok, mp,

						XFS_ERRTAG_ITOBP_INOTOBP,

						XFS_RANDOM_ITOBP_INOTOBP))) {

			if (imap_flags & XFS_IMAP_BULKSTAT) {

				xfs_trans_brelse(tp, bp);

				return XFS_ERROR(EINVAL);

			}

#ifdef DEBUG

			if (!(imap_flags & XFS_IMAP_BULKSTAT))

			cmn_err(CE_ALERT,

					"Device %s - bad inode magic/vsn "

					"daddr %lld #%d (magic=%x)",