From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8086EC433EF for ; Tue, 18 Jan 2022 03:17:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350928AbiARDRo (ORCPT ); Mon, 17 Jan 2022 22:17:44 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:42572 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348263AbiARDJf (ORCPT ); Mon, 17 Jan 2022 22:09:35 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8E64AB81229; Tue, 18 Jan 2022 03:09:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DF59C36AE3; Tue, 18 Jan 2022 03:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642475366; bh=jxzl+T9Tmow7LV9piaMJ7WdRrbsfKDF/gIFVJ4zgETs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RSurrgJ6IKukXAlXjfZi1QnKMonpFuJrxTxDE4y6zX0g19QO1DcsfqTpwBxuKbCdt Si6/wP4WnnQaybmQ7juLZLFKhzB4PQgX36Fyp8JUUCkpL4ANtJwTXbWrAMGscMz3IS LxCCaCHR144aaXsUWSHajmQpkLeICXbIlK8l53WF6P2hAHNbQbMXYoVTuKOpO5d3za wo8DBPT14+gp2vGlFcpXY6rz3UGL7iEUqSfk/6BzWXAGloEchefwFwBBGxe3u3z7HK rs0Haqs+Nz6WmD+SPFxRrVet4Gdhv0AfOBuoXbh0ZfLn2gJRvUnL8D15G5pmgXZdPI Jv9W4+Fe+wIxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , David Sterba , Sasha Levin , clm@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 23/29] btrfs: remove BUG_ON(!eie) in find_parent_nodes Date: Mon, 17 Jan 2022 22:08:16 -0500 Message-Id: <20220118030822.1955469-23-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118030822.1955469-1-sashal@kernel.org> References: <20220118030822.1955469-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Josef Bacik [ Upstream commit 9f05c09d6baef789726346397438cca4ec43c3ee ] If we're looking for leafs that point to a data extent we want to record the extent items that point at our bytenr. At this point we have the reference and we know for a fact that this leaf should have a reference to our bytenr. However if there's some sort of corruption we may not find any references to our leaf, and thus could end up with eie == NULL. Replace this BUG_ON() with an ASSERT() and then return -EUCLEAN for the mortals. Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/backref.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index c59a13a53b1cc..00c9a9e719ece 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1109,10 +1109,18 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, goto out; if (!ret && extent_item_pos) { /* - * we've recorded that parent, so we must extend - * its inode list here + * We've recorded that parent, so we must extend + * its inode list here. + * + * However if there was corruption we may not + * have found an eie, return an error in this + * case. */ - BUG_ON(!eie); + ASSERT(eie); + if (!eie) { + ret = -EUCLEAN; + goto out; + } while (eie->next) eie = eie->next; eie->next = ref->inode_list; -- 2.34.1