Commit 75f49c3d authored by Yue Haibing's avatar Yue Haibing Committed by David Sterba
Browse files

btrfs: fix passing 0 to ERR_PTR in btrfs_search_dir_index_item() 



The ret may be zero in btrfs_search_dir_index_item() and should not
passed to ERR_PTR(). Now btrfs_unlink_subvol() is the only caller to
this, reconstructed it to check ERR_PTR(-ENOENT) while ret >= 0.

This fixes smatch warnings:

fs/btrfs/dir-item.c:353
  btrfs_search_dir_index_item() warn: passing zero to 'ERR_PTR'

Fixes: 9dcbe16f ("btrfs: use btrfs_for_each_slot in btrfs_search_dir_index_item")
CC: stable@vger.kernel.org # 6.1+
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3c36a72c

fs/btrfs/dir-item.c

+2 −2
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path, 
			return di;

	}

	/* Adjust return code if the key was not found in the next leaf. */

	if (ret > 0)

		ret = 0;

	if (ret >= 0)

		ret = -ENOENT;



	return ERR_PTR(ret);

}

fs/btrfs/inode.c

+2 −5
Original line number Diff line number Diff line
@@ -4368,10 +4368,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	 */

	if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {

		di = btrfs_search_dir_index_item(root, path, dir_ino, &fname.disk_name);

		if (IS_ERR_OR_NULL(di)) {

			if (!di)

				ret = -ENOENT;

			else

		if (IS_ERR(di)) {

			ret = PTR_ERR(di);

			btrfs_abort_transaction(trans, ret);

			goto out;