From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F5C6173D9C; Fri, 29 Mar 2024 12:35:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715711; cv=none; b=JLA34ektGezlaUmJV3jyGacrtvWP17A+TVWETWquZrXm4WANKKIE6Y7DqTaYO9ioBjo/Dm3lhRNHQZrWHGIdjXNtB2uOUj/0jUkId1BU4w201UWNAup8bWBG2tPa1stXbq1+jwYPhn2c1SIw6Uhlp9Vco2hzpnFpzzurtu/eKmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715711; c=relaxed/simple; bh=cpHNBfKk529oOkjbsJ4ZSHaOTq6oarlx4e5vOEXv7lc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J+jXUgUwVRXrj5yWeWQOFywaaoCCzVrlS1NWlg4mdBiUA0y9cqoO33WjLzPPF9rB6d6Zdnq8qByv1OWnjjPQyQsPbErOgYDAWxfLa9rP8AL48Jz+WRv0fmJUoJGKCQNQl3X26d2ZV9l3z1V9VibUI8PPzyvymwCoLEmdBCGAAYE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mkB+jvDS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mkB+jvDS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33EF5C43330; Fri, 29 Mar 2024 12:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715711; bh=cpHNBfKk529oOkjbsJ4ZSHaOTq6oarlx4e5vOEXv7lc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mkB+jvDSdtlv1Z0e2xWad5zg2pH3X7TFE4cagMN7CiMY/Sn0Z0tQ/3dUlNso5Oq08 L//b+VsPScdJgONS526Q3Qp7EBOatS9m9sYvhwvLoTWStawleilBbgRI0QHiT7Q+Or BTZL/waLAd7950RxQs6ABtrvqgZWFREtJ4aTAnXizJsdz1EjsLdYcUjtxhXUTcsAcI T5VWt4sSFPEQC+mWDS8vWf3enSN6rnKYklebeS1qYUECKCKGMYKvEpmPR5CSKWtwoD ndi4/OBkVFqJ31bG+JT5Y4kLPd61+rpmLFr+ROhMbqT42vMFahwIxCaDXuIXMbHPjq +Pja0r6tluyLg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Sterba , Josef Bacik , Anand Jain , Sasha Levin , clm@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 12/15] btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() Date: Fri, 29 Mar 2024 08:34:35 -0400 Message-ID: <20240329123445.3086536-12-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123445.3086536-1-sashal@kernel.org> References: <20240329123445.3086536-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.273 Content-Transfer-Encoding: 8bit From: David Sterba [ Upstream commit 7411055db5ce64f836aaffd422396af0075fdc99 ] The unhandled case in btrfs_relocate_sys_chunks() loop is a corruption, as it could be caused only by two impossible conditions: - at first the search key is set up to look for a chunk tree item, with offset -1, this is an inexact search and the key->offset will contain the correct offset upon a successful search, a valid chunk tree item cannot have an offset -1 - after first successful search, the found_key corresponds to a chunk item, the offset is decremented by 1 before the next loop, it's impossible to find a chunk item there due to alignment and size constraints Reviewed-by: Josef Bacik Reviewed-by: Anand Jain Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/volumes.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index e11c8da9a5605..b5873df0aa93a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3268,7 +3268,17 @@ static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info) mutex_unlock(&fs_info->delete_unused_bgs_mutex); goto error; } - BUG_ON(ret == 0); /* Corruption */ + if (ret == 0) { + /* + * On the first search we would find chunk tree with + * offset -1, which is not possible. On subsequent + * loops this would find an existing item on an invalid + * offset (one less than the previous one, wrong + * alignment and size). + */ + ret = -EUCLEAN; + goto error; + } ret = btrfs_previous_item(chunk_root, path, key.objectid, key.type); -- 2.43.0