summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2007-05-24 15:21:11 +1000
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-07-14 15:22:50 +1000
commitca165b88927e41ad18908d7b37f08ef81eae0bf8 (patch)
treedbe4595d1e14fef288d321cd4137bc402a4ce334 /fs/xfs
parent3db296f341b5902c4f9317022ae5d4da2d59d598 (diff)
downloadlinux-3.10-ca165b88927e41ad18908d7b37f08ef81eae0bf8.tar.gz
linux-3.10-ca165b88927e41ad18908d7b37f08ef81eae0bf8.tar.bz2
linux-3.10-ca165b88927e41ad18908d7b37f08ef81eae0bf8.zip
[XFS] Fix double free in xfs_buf_get_noaddr error handling path
SGI-PV: 964983 SGI-Modid: xfs-linux-melb:xfs-kern:28639a Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 208daf58b82..192aa065091 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -792,8 +792,9 @@ xfs_buf_get_noaddr(
fail_free_mem:
while (--i >= 0)
__free_page(bp->b_pages[i]);
+ _xfs_buf_free_pages(bp);
fail_free_buf:
- xfs_buf_free(bp);
+ xfs_buf_deallocate(bp);
fail:
return NULL;
}