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 29EA4C4167D for ; Fri, 11 Nov 2022 02:33:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232409AbiKKCdv (ORCPT ); Thu, 10 Nov 2022 21:33:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231559AbiKKCdt (ORCPT ); Thu, 10 Nov 2022 21:33:49 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03C23BCB5; Thu, 10 Nov 2022 18:33:49 -0800 (PST) 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 AFEDBB822ED; Fri, 11 Nov 2022 02:33:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 902D5C433D7; Fri, 11 Nov 2022 02:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668134026; bh=swnkK04J2A4wlUjLMjjveUJXFWsbyTlbGQD9t2TF7OA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u+OIOkXLMOpcpj1QLds+wenJ79L8wscmtqVUOQcJRs5VKFy47T8Zv1bf4gekHPGDb IMHwGLZ4ni/4c1tyYQxPeE/6nUTtmmSkRJZFNM5PLoY0/zNjSHZp2QBxEOQ64KAfeQ pjsc4PJXtSJiYrpIfQsmuuTY0m5YUVWseepYUdnbj8gOiyR81d2dbgMEuQyOFuooyV CKFJBr5sCNw1io74/UIq7E3vRbeZmup2LN6efpUT35C7G+4zMoeTS2qHh39yoAQhVV isn0ggo8a/kI4zdZkYtDcvuYC49feOjqSPvck2YPgC2djpxGSt1ZjRR8DIxiu9H7eH VvA5KsVrz9hmA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qu Wenruo , David Sterba , Sasha Levin , clm@fb.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 03/30] btrfs: raid56: properly handle the error when unable to find the missing stripe Date: Thu, 10 Nov 2022 21:33:11 -0500 Message-Id: <20221111023340.227279-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221111023340.227279-1-sashal@kernel.org> References: <20221111023340.227279-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: stable@vger.kernel.org From: Qu Wenruo [ Upstream commit f15fb2cd979a07fbfc666e2f04b8b30ec9233b2a ] In raid56_alloc_missing_rbio(), if we can not determine where the missing device is inside the full stripe, we just BUG_ON(). This is not necessary especially the only caller inside scrub.c is already properly checking the return value, and will treat it as a memory allocation failure. Fix the error handling by: - Add an extra warning for the reason Although personally speaking it may be better to be an ASSERT(). - Properly free the allocated rbio Signed-off-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/raid56.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 2feb5c20641a..a21b9e085d1b 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -2767,8 +2767,10 @@ raid56_alloc_missing_rbio(struct bio *bio, struct btrfs_io_context *bioc) rbio->faila = find_logical_bio_stripe(rbio, bio); if (rbio->faila == -1) { - BUG(); - kfree(rbio); + btrfs_warn_rl(fs_info, + "can not determine the failed stripe number for full stripe %llu", + bioc->raid_map[0]); + __free_raid_bio(rbio); return NULL; } -- 2.35.1