aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorChandra Seetharaman <sekharan@us.ibm.com>2011-08-02 22:18:29 -0400
committerAlex Elder <aelder@sgi.com>2011-08-12 14:39:29 -0400
commitac4d6888b21a8be373f3e06f1d4011fbe2bbbeac (patch)
tree6a39e3be9bcf99cddc0ce0b0ed15aac794b527f8 /fs/xfs/xfs_log_recover.c
parent9e978d8f7db1c5de7cdc6450a8ca208db3b95f84 (diff)
xfs: Check the return value of xfs_buf_read() for NULL
Check the return value of xfs_buf_read() for NULL and return ENOMEM if it is NULL. This is necessary in a few spots to avoid subsequent code blindly dereferencing the null buffer pointer. Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r--fs/xfs/xfs_log_recover.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 1076b7effcdc..b9afff8a1be2 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2131,6 +2131,8 @@ xlog_recover_buffer_pass2(
2131 2131
2132 bp = xfs_buf_read(mp->m_ddev_targp, buf_f->blf_blkno, buf_f->blf_len, 2132 bp = xfs_buf_read(mp->m_ddev_targp, buf_f->blf_blkno, buf_f->blf_len,
2133 buf_flags); 2133 buf_flags);
2134 if (!bp)
2135 return XFS_ERROR(ENOMEM);
2134 error = xfs_buf_geterror(bp); 2136 error = xfs_buf_geterror(bp);
2135 if (error) { 2137 if (error) {
2136 xfs_ioerror_alert("xlog_recover_do..(read#1)", mp, 2138 xfs_ioerror_alert("xlog_recover_do..(read#1)", mp,
@@ -2222,6 +2224,10 @@ xlog_recover_inode_pass2(
2222 2224
2223 bp = xfs_buf_read(mp->m_ddev_targp, in_f->ilf_blkno, in_f->ilf_len, 2225 bp = xfs_buf_read(mp->m_ddev_targp, in_f->ilf_blkno, in_f->ilf_len,
2224 XBF_LOCK); 2226 XBF_LOCK);
2227 if (!bp) {
2228 error = ENOMEM;
2229 goto error;
2230 }
2225 error = xfs_buf_geterror(bp); 2231 error = xfs_buf_geterror(bp);
2226 if (error) { 2232 if (error) {
2227 xfs_ioerror_alert("xlog_recover_do..(read#2)", mp, 2233 xfs_ioerror_alert("xlog_recover_do..(read#2)", mp,