summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@sgi.com>2008-07-18 17:13:12 +1000
committerNiv Sardi <xaiki@debian.org>2008-07-28 16:59:34 +1000
commitc032bfcf468013643e05c8274824af10dd7cbb61 (patch)
treea45a27cb8647dd5685deccf2035acada24a93f4a
parent6a617dd22bdbf5a4c9828db98c1a8b076c9e95c8 (diff)
downloadlinux-3.10-c032bfcf468013643e05c8274824af10dd7cbb61.tar.gz
linux-3.10-c032bfcf468013643e05c8274824af10dd7cbb61.tar.bz2
linux-3.10-c032bfcf468013643e05c8274824af10dd7cbb61.zip
[XFS] fix use after free with external logs or real-time devices
SGI-PV: 983806 SGI-Modid: xfs-linux-melb:xfs-kern:31666a Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: Christoph Hellwig <hch@infradead.org>
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index b4008668004..30ae96397e3 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -792,12 +792,14 @@ xfs_close_devices(
struct xfs_mount *mp)
{
if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) {
+ struct block_device *logdev = mp->m_logdev_targp->bt_bdev;
xfs_free_buftarg(mp->m_logdev_targp);
- xfs_blkdev_put(mp->m_logdev_targp->bt_bdev);
+ xfs_blkdev_put(logdev);
}
if (mp->m_rtdev_targp) {
+ struct block_device *rtdev = mp->m_rtdev_targp->bt_bdev;
xfs_free_buftarg(mp->m_rtdev_targp);
- xfs_blkdev_put(mp->m_rtdev_targp->bt_bdev);
+ xfs_blkdev_put(rtdev);
}
xfs_free_buftarg(mp->m_ddev_targp);
}