aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2017-07-31 15:08:12 -0500
committerEric Sandeen <sandeen@redhat.com>2017-07-31 15:08:12 -0500
commitc3d6d07aacf85649482c1007b9183d69eca8262c (patch)
tree98e97c58be42685d89571d5dedf28f11bd939a7f
parent7fb34b56e45a7b0b6eaeeef924158d3f281000a7 (diff)
downloadxfsprogs-dev-c3d6d07aacf85649482c1007b9183d69eca8262c.tar.gz
xfs: check _btree_check_block value
Source kernel commit: 1e86eabe73b73c82e1110c746ed3ec6d5e1c0a0d Check the _btree_check_block return value for the firstrec and lastrec functions, since we have the ability to signal that the repositioning did not succeed. Fixes-coverity-id: 114067 Fixes-coverity-id: 114068 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--libxfs/xfs_btree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 1d39245086..0ceba82a88 100644
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -724,7 +724,8 @@ xfs_btree_firstrec(
* Get the block pointer for this level.
*/
block = xfs_btree_get_block(cur, level, &bp);
- xfs_btree_check_block(cur, block, level, bp);
+ if (xfs_btree_check_block(cur, block, level, bp))
+ return 0;
/*
* It's empty, there is no such record.
*/
@@ -753,7 +754,8 @@ xfs_btree_lastrec(
* Get the block pointer for this level.
*/
block = xfs_btree_get_block(cur, level, &bp);
- xfs_btree_check_block(cur, block, level, bp);
+ if (xfs_btree_check_block(cur, block, level, bp))
+ return 0;
/*
* It's empty, there is no such record.
*/