Skip to content

Commit

Permalink
xfs: fix inode validity check in xfs_iflush_cluster
Browse files Browse the repository at this point in the history
commit 51b07f30a71c27405259a0248206ed4e22adbee2 upstream.

Some careless idiot(*) wrote crap code in commit 1a3e8f3 ("xfs:
convert inode cache lookups to use RCU locking") back in late 2010,
and so xfs_iflush_cluster checks the wrong inode for whether it is
still valid under RCU protection. Fix it to lock and check the
correct inode.

(*) Careless-idiot: Dave Chinner <dchinner@redhat.com>

cc: <stable@vger.kernel.org> # 3.10.x-
Discovered-by: Brain Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
  • Loading branch information
Dave Chinner authored and Ahmed Hady committed Aug 14, 2018
1 parent 3382402 commit d5263a2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/xfs/xfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2604,13 +2604,13 @@ xfs_iflush_cluster(
* We need to check under the i_flags_lock for a valid inode
* here. Skip it if it is not valid or the wrong inode.
*/
spin_lock(&ip->i_flags_lock);
if (!ip->i_ino ||
spin_lock(&iq->i_flags_lock);
if (!iq->i_ino ||
(XFS_INO_TO_AGINO(mp, iq->i_ino) & mask) != first_index) {
spin_unlock(&ip->i_flags_lock);
spin_unlock(&iq->i_flags_lock);
continue;
}
spin_unlock(&ip->i_flags_lock);
spin_unlock(&iq->i_flags_lock);

/*
* Do an un-protected check to see if the inode is dirty and
Expand Down

0 comments on commit d5263a2

Please sign in to comment.