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 7198C1BA270; Wed, 25 Sep 2024 12:18:00 +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=1727266680; cv=none; b=fxJ0tsFsR+MJT1jJ57pBsj1R4XzU6uKTyuEZbc2tkLZqk+qMhlayoy0jJCwguzh9vhySEa5dHa0fIraAhfMkp9wWKDm190V+WzPjDdWPsZ8Inhcx/F+7FEbpM8ixbVD3knq6XLT6q61eK7uhpvEzhkwUeHY0T5m7XDIWglOieNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266680; c=relaxed/simple; bh=IBDFPYW2VH5z5R4e/X/vLafgvu/p2wrKZu46s26RykE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Li55Ne1ZN3tWXLhe4sgDwX0KXHRBQAgT44twCQfnnLkKwySHhYzVTAiVl3EPz0PkrLmAXadKfgYRpIYZDe46+KiJlo3r+J1/T2ebCFZ/4VY7JaDEv2mmNYz+0/gcmILdeMAp7PIMRQ2g0yD91b7nl6sjy48kzMV4PLAEbHEPhAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IdCryclD; 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="IdCryclD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F013C4CEC3; Wed, 25 Sep 2024 12:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266680; bh=IBDFPYW2VH5z5R4e/X/vLafgvu/p2wrKZu46s26RykE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IdCryclDRDkHkBUsOgeP3p5DAFLrlKHRHaRsFj772Rpq2uGbQJVPjZUvHFn0RI20I tgC+0iA8SumWRG36oAqKMSbbyqUuEzmw5iQCLqhR6eEOLdsr965VnUvXh/wa5Jt7FT aBrIfCGVUX4dsTztyK6dOwhufmSaGzasX2/BA0XJjXXJXSa6LxzN/OdvihH5TDdaRM 0986re19auZOw37AKxkAvpPkFKxUAfMIADaqzcFbx7JPAgx0kU3kyEvZIhYeKvymPP TdDUrx7fMSOW4VZOi8RD7WNreZ0mKpSgHUrWV5anp/fE9I6Nfc9zN4Qe1HiO/FT+CN 6Xa8D6JevBtQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thadeu Lima de Souza Cascardo , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 134/139] ext4: ext4_search_dir should return a proper error Date: Wed, 25 Sep 2024 08:09:14 -0400 Message-ID: <20240925121137.1307574-134-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-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 6.6.52 Content-Transfer-Encoding: 8bit From: Thadeu Lima de Souza Cascardo [ Upstream commit cd69f8f9de280e331c9e6ff689ced0a688a9ce8f ] ext4_search_dir currently returns -1 in case of a failure, while it returns 0 when the name is not found. In such failure cases, it should return an error code instead. This becomes even more important when ext4_find_inline_entry returns an error code as well in the next commit. -EFSCORRUPTED seems appropriate as such error code as these failures would be caused by unexpected record lengths and is in line with other instances of ext4_check_dir_entry failures. In the case of ext4_dx_find_entry, the current use of ERR_BAD_DX_DIR was left as is to reduce the risk of regressions. Signed-off-by: Thadeu Lima de Souza Cascardo Link: https://patch.msgid.link/20240821152324.3621860-2-cascardo@igalia.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/namei.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 3bd2301cb48e7..9913aa37e697c 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1526,7 +1526,7 @@ static bool ext4_match(struct inode *parent, } /* - * Returns 0 if not found, -1 on failure, and 1 on success + * Returns 0 if not found, -EFSCORRUPTED on failure, and 1 on success */ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, struct inode *dir, struct ext4_filename *fname, @@ -1547,7 +1547,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, * a full check */ if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf, buf_size, offset)) - return -1; + return -EFSCORRUPTED; *res_dir = de; return 1; } @@ -1555,7 +1555,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, de_len = ext4_rec_len_from_disk(de->rec_len, dir->i_sb->s_blocksize); if (de_len <= 0) - return -1; + return -EFSCORRUPTED; offset += de_len; de = (struct ext4_dir_entry_2 *) ((char *) de + de_len); } @@ -1707,8 +1707,10 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir, goto cleanup_and_exit; } else { brelse(bh); - if (i < 0) + if (i < 0) { + ret = ERR_PTR(i); goto cleanup_and_exit; + } } next: if (++block >= nblocks) @@ -1803,7 +1805,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, if (retval == 1) goto success; brelse(bh); - if (retval == -1) { + if (retval < 0) { bh = ERR_PTR(ERR_BAD_DX_DIR); goto errout; } -- 2.43.0