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 E34D578B61; Tue, 27 Feb 2024 14:03:41 +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=1709042622; cv=none; b=lavSOzbL0mf4+qOSU8FQn7wX7fHZP9ltdtLBnx4YW2hUomUFCvaQ8kr1SpeOALPJTo0zR44LfGgAg5WXZp5A+hVN9FUEwV85FEepDTfim4QXqbOXusFGgC9ZkVstSTPv8wZxxfg6VB72pXFacew5XNnyEoGrEu8S2orCjKKYFYI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042622; c=relaxed/simple; bh=M0L5L6rTbMOqcneVPCbGIbIP01f+IgOzJOyWH87FErY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h5X6GAis361pQK0zlrbf4WPYmLfL/cillK3ptR4TDXhyW3ZgJvnt/YwGzl0jPMbX26/FO/IoOm8Ya+mZES5TTeSpicthGITghif8IBbw+/6dgqkvKkQWYI/ff2gbgQO3L5fUiZbyRctytB50HdlZBHB3DP4WuLnW77XQmVvg49Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UEcxLbRt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UEcxLbRt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75455C433C7; Tue, 27 Feb 2024 14:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709042621; bh=M0L5L6rTbMOqcneVPCbGIbIP01f+IgOzJOyWH87FErY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UEcxLbRt7c0olTeV0mG0/CP86B+L0uw2dbWKXNXMTMxyvF62iVlyH+cFPvurvX2xf rRijiN3zIzth+/vlhCqG4pPT3N/QC9DY+m9FZw2jBW0JGvF1R0hGhAj4SnuUH/ToFI MzOK992k0M21h82TTYhJj8HqHwOVAIcGLl8fO/SM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baokun Li , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 5.15 032/245] ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal() Date: Tue, 27 Feb 2024 14:23:40 +0100 Message-ID: <20240227131616.161167074@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131615.098467438@linuxfoundation.org> References: <20240227131615.098467438@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baokun Li [ Upstream commit 832698373a25950942c04a512daa652c18a9b513 ] Places the logic for checking if the group's block bitmap is corrupt under the protection of the group lock to avoid allocating blocks from the group with a corrupted block bitmap. Signed-off-by: Baokun Li Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20240104142040.2835097-8-libaokun1@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/mballoc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 3e4be376a479a..622f60d9e1c68 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2236,12 +2236,10 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, if (err) return err; - if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))) { - ext4_mb_unload_buddy(e4b); - return 0; - } - ext4_lock_group(ac->ac_sb, group); + if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))) + goto out; + max = mb_find_extent(e4b, ac->ac_g_ex.fe_start, ac->ac_g_ex.fe_len, &ex); ex.fe_logical = 0xDEADFA11; /* debug value */ @@ -2274,6 +2272,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, ac->ac_b_ex = ex; ext4_mb_use_best_found(ac, e4b); } +out: ext4_unlock_group(ac->ac_sb, group); ext4_mb_unload_buddy(e4b); -- 2.43.0