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 56AB8C25B0F for ; Sun, 14 Aug 2022 15:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241834AbiHNPuG (ORCPT ); Sun, 14 Aug 2022 11:50:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241720AbiHNPst (ORCPT ); Sun, 14 Aug 2022 11:48:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B9AA101E4; Sun, 14 Aug 2022 08:35:31 -0700 (PDT) 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 7FBDDB80B77; Sun, 14 Aug 2022 15:35:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65C4BC433C1; Sun, 14 Aug 2022 15:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660491329; bh=gQi2PczOaRIn8XIrEGaTogKHsMsbNglZfG09OvFUiPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R1cNozMdpibqep1Jg26TqLqUrPnuP0T6d77Ko4x6lyBlpOQhRxcYEAPT5ED+4etqV Zp7KVOZzQnn6lSxRdVCkAAV7Wvzhnv8ea/WNbz8E41BAarHydWAKFI+YCdaUsrIDEf pV+5oStSAKqLxJF3AhzTR0ALFAdP09wlUMlP4YauUnmL8vpxNCuu7geBQNuKRQd5n4 dgBC/q3Qs123kezwYSY97Q9d+nebGVl5Whr7EjWNt8YCyZtDjs8FsCa3pUnVzTPbEW pmBAG8aGWrcT0gSZcmIPwR8oRJue4bwS/HSJkX1rT627S14L6r6fA6DYbXZz1qv76s unUsnY7OYhVMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ye Bin , Jan Kara , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 30/31] ext4: avoid remove directory when directory is corrupted Date: Sun, 14 Aug 2022 11:34:30 -0400 Message-Id: <20220814153431.2379231-30-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814153431.2379231-1-sashal@kernel.org> References: <20220814153431.2379231-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-ext4@vger.kernel.org From: Ye Bin [ Upstream commit b24e77ef1c6d4dbf42749ad4903c97539cc9755a ] Now if check directoy entry is corrupted, ext4_empty_dir may return true then directory will be removed when file system mounted with "errors=continue". In order not to make things worse just return false when directory is corrupted. Signed-off-by: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20220622090223.682234-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/namei.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2c9ae72a1f5c..b7026a748854 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2938,11 +2938,8 @@ bool ext4_empty_dir(struct inode *inode) de = (struct ext4_dir_entry_2 *) (bh->b_data + (offset & (sb->s_blocksize - 1))); if (ext4_check_dir_entry(inode, NULL, de, bh, - bh->b_data, bh->b_size, offset)) { - offset = (offset | (sb->s_blocksize - 1)) + 1; - continue; - } - if (le32_to_cpu(de->inode)) { + bh->b_data, bh->b_size, offset) || + le32_to_cpu(de->inode)) { brelse(bh); return false; } -- 2.35.1