* [PATCH] ext4: Fix checking of entry validity
@ 2020-07-31 16:21 Jan Kara
2020-08-01 23:18 ` Sasha Levin
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Jan Kara @ 2020-07-31 16:21 UTC (permalink / raw)
To: Ted Tso; +Cc: linux-ext4, Jan Kara, stable
ext4_search_dir() and ext4_generic_delete_entry() can be called both for
standard director blocks and for inline directories stored inside inode
or inline xattr space. For the second case we didn't call
ext4_check_dir_entry() with proper constraints that could result in
accepting corrupted directory entry as well as false positive filesystem
errors like:
EXT4-fs error (device dm-0): ext4_search_dir:1395: inode #28320400:
block 113246792: comm dockerd: bad entry in directory: directory entry too
close to block end - offset=0, inode=28320403, rec_len=32, name_len=8,
size=4096
Fix the arguments passed to ext4_check_dir_entry().
Fixes: 109ba779d6cc ("ext4: check for directory entries too close to block end")
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/ext4/namei.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 56738b538ddf..98b91f2314eb 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1396,8 +1396,8 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
ext4_match(dir, fname, de)) {
/* found a match - just to be sure, do
* a full check */
- if (ext4_check_dir_entry(dir, NULL, de, bh, bh->b_data,
- bh->b_size, offset))
+ if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf,
+ buf_size, offset))
return -1;
*res_dir = de;
return 1;
@@ -2472,7 +2472,7 @@ int ext4_generic_delete_entry(handle_t *handle,
de = (struct ext4_dir_entry_2 *)entry_buf;
while (i < buf_size - csum_size) {
if (ext4_check_dir_entry(dir, NULL, de, bh,
- bh->b_data, bh->b_size, i))
+ entry_buf, buf_size, i))
return -EFSCORRUPTED;
if (de == de_del) {
if (pde)
--
2.16.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
@ 2020-08-01 23:18 ` Sasha Levin
2020-08-06 1:24 ` Sasha Levin
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-01 23:18 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.7.11, v5.4.54, v4.19.135, v4.14.190, v4.9.231, v4.4.231.
v5.7.11: Build OK!
v5.4.54: Build OK!
v4.19.135: Build OK!
v4.14.190: Build OK!
v4.9.231: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.231: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
2020-08-01 23:18 ` Sasha Levin
@ 2020-08-06 1:24 ` Sasha Levin
2020-08-07 20:07 ` tytso
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-06 1:24 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.7.11, v5.4.54, v4.19.135, v4.14.190, v4.9.231, v4.4.231.
v5.7.11: Build OK!
v5.4.54: Build OK!
v4.19.135: Build OK!
v4.14.190: Build OK!
v4.9.231: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.231: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
2020-08-01 23:18 ` Sasha Levin
2020-08-06 1:24 ` Sasha Levin
@ 2020-08-07 20:07 ` tytso
2020-08-09 15:53 ` Sasha Levin
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: tytso @ 2020-08-07 20:07 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-ext4, stable
Thanks, applied, although I changed the commit summary to be:
ext4: fix checking of directory entry validity for inline directories
- Ted
On Fri, Jul 31, 2020 at 06:21:35PM +0200, Jan Kara wrote:
> ext4_search_dir() and ext4_generic_delete_entry() can be called both for
> standard director blocks and for inline directories stored inside inode
> or inline xattr space. For the second case we didn't call
> ext4_check_dir_entry() with proper constraints that could result in
> accepting corrupted directory entry as well as false positive filesystem
> errors like:
>
> EXT4-fs error (device dm-0): ext4_search_dir:1395: inode #28320400:
> block 113246792: comm dockerd: bad entry in directory: directory entry too
> close to block end - offset=0, inode=28320403, rec_len=32, name_len=8,
> size=4096
>
> Fix the arguments passed to ext4_check_dir_entry().
>
> Fixes: 109ba779d6cc ("ext4: check for directory entries too close to block end")
> CC: stable@vger.kernel.org
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> fs/ext4/namei.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
` (2 preceding siblings ...)
2020-08-07 20:07 ` tytso
@ 2020-08-09 15:53 ` Sasha Levin
2020-08-13 16:25 ` Sasha Levin
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-09 15:53 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.8, v5.7.13, v5.4.56, v4.19.137, v4.14.192, v4.9.232, v4.4.232.
v5.8: Build OK!
v5.7.13: Build OK!
v5.4.56: Build OK!
v4.19.137: Build OK!
v4.14.192: Build OK!
v4.9.232: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.232: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
` (3 preceding siblings ...)
2020-08-09 15:53 ` Sasha Levin
@ 2020-08-13 16:25 ` Sasha Levin
2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-13 16:25 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.8, v5.7.14, v5.4.57, v4.19.138, v4.14.193, v4.9.232, v4.4.232.
v5.8: Build OK!
v5.7.14: Build OK!
v5.4.57: Build OK!
v4.19.138: Build OK!
v4.14.193: Build OK!
v4.9.232: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.232: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
` (4 preceding siblings ...)
2020-08-13 16:25 ` Sasha Levin
@ 2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-19 23:56 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.8.1, v5.7.15, v5.4.58, v4.19.139, v4.14.193, v4.9.232, v4.4.232.
v5.8.1: Build OK!
v5.7.15: Build OK!
v5.4.58: Build OK!
v4.19.139: Build OK!
v4.14.193: Build failed! Errors:
v4.9.232: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.232: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ext4: Fix checking of entry validity
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
` (5 preceding siblings ...)
2020-08-19 23:56 ` Sasha Levin
@ 2020-08-26 13:53 ` Sasha Levin
6 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2020-08-26 13:53 UTC (permalink / raw)
To: Sasha Levin, Jan Kara, Ted Tso; +Cc: linux-ext4, Jan Kara, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 109ba779d6cc ("ext4: check for directory entries too close to block end").
The bot has tested the following trees: v5.8.2, v5.7.16, v5.4.59, v4.19.140, v4.14.193, v4.9.232, v4.4.232.
v5.8.2: Build OK!
v5.7.16: Build OK!
v5.4.59: Build OK!
v4.19.140: Build OK!
v4.14.193: Build OK!
v4.9.232: Failed to apply! Possible dependencies:
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel execution")
7046ae35329f ("ext4: Add iomap support for inline data")
7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")
9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc call")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate uaccess_* macros")
ee73f9a52a34 ("ext4: convert to new i_version API")
eeca7ea1baa9 ("ext4: use current_time() for inode timestamps")
v4.4.232: Failed to apply! Possible dependencies:
12735f881952 ("ext4: pre-zero allocated blocks for DAX IO")
2dcba4781fa3 ("ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag")
364443cbcfe7 ("ext4: convert DAX reads to iomap infrastructure")
7046ae35329f ("ext4: Add iomap support for inline data")
705965bd6dfa ("ext4: rename and split get blocks functions")
b886ee3e778e ("ext4: Support case-insensitive file name lookups")
ba5843f51d46 ("ext4: use pre-zeroed blocks for DAX page faults")
c86d8db33a92 ("ext4: implement allocation of pre-zeroed blocks")
ee73f9a52a34 ("ext4: convert to new i_version API")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-08-26 13:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-31 16:21 [PATCH] ext4: Fix checking of entry validity Jan Kara
2020-08-01 23:18 ` Sasha Levin
2020-08-06 1:24 ` Sasha Levin
2020-08-07 20:07 ` tytso
2020-08-09 15:53 ` Sasha Levin
2020-08-13 16:25 ` Sasha Levin
2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).