]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
xfs: check _btree_check_block value
authorDarrick J. Wong <darrick.wong@oracle.com>
Mon, 17 Jul 2017 21:30:45 +0000 (14:30 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Thu, 20 Jul 2017 21:42:32 +0000 (14:42 -0700)
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>
fs/xfs/libxfs/xfs_btree.c

index 4da85fff69ad0aa390a73fe4d5f47ae766b56abb..e0bcc4a59efdac646947f917f8c5d2a7713997fb 100644 (file)
@@ -728,7 +728,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.
         */
@@ -757,7 +758,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.
         */