diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-07-17 14:30:57 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2017-07-20 14:42:33 -0700 |
| commit | 10479e2dea83d4c421ad05dfc55d918aa8dfc0cd (patch) | |
| tree | 65bd2a8994345c5b793541206f54a15bf56903a9 /fs/xfs | |
| parent | 4c1a67bd3606540b9b42caff34a1d5cd94b1cf65 (diff) | |
| download | linux-stable-10479e2dea83d4c421ad05dfc55d918aa8dfc0cd.tar.gz linux-stable-10479e2dea83d4c421ad05dfc55d918aa8dfc0cd.tar.bz2 linux-stable-10479e2dea83d4c421ad05dfc55d918aa8dfc0cd.zip | |
xfs: check _alloc_read_agf buffer pointer before using
In some circumstances, _alloc_read_agf can return an error code of zero
but also a null AGF buffer pointer. Check for this and jump out.
Fixes-coverity-id: 1415250
Fixes-coverity-id: 1415320
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_refcount.c | 4 | ||||
| -rw-r--r-- | fs/xfs/xfs_reflink.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c index 900ea231f9a3..45b1c3b4e047 100644 --- a/fs/xfs/libxfs/xfs_refcount.c +++ b/fs/xfs/libxfs/xfs_refcount.c @@ -1638,6 +1638,10 @@ xfs_refcount_recover_cow_leftovers( error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp); if (error) goto out_trans; + if (!agbp) { + error = -ENOMEM; + goto out_trans; + } cur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL); /* Find all the leftover CoW staging extents. */ diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index d9b3d57a1921..f45fbf0db9bb 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -170,6 +170,8 @@ xfs_reflink_find_shared( error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp); if (error) return error; + if (!agbp) + return -ENOMEM; cur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL); |