38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Kara <jack@suse.cz>
|
||
|
|
Date: Mon, 22 Aug 2022 13:48:32 +0200
|
||
|
|
Subject: [PATCH] ext4: fix check for block being out of directory size
|
||
|
|
|
||
|
|
commit 61a1d87a324ad5e3ed27c6699dfc93218fcf3201 upstream.
|
||
|
|
|
||
|
|
The check in __ext4_read_dirblock() for block being outside of directory
|
||
|
|
size was wrong because it compared block number against directory size
|
||
|
|
in bytes. Fix it.
|
||
|
|
|
||
|
|
Fixes: 65f8ea4cd57d ("ext4: check if directory block is within i_size")
|
||
|
|
CVE: CVE-2022-1184
|
||
|
|
CC: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Jan Kara <jack@suse.cz>
|
||
|
|
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
|
||
|
|
Link: https://lore.kernel.org/r/20220822114832.1482-1-jack@suse.cz
|
||
|
|
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||
|
|
---
|
||
|
|
fs/ext4/namei.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
|
||
|
|
index 7d3ec39121f7..86ee0e0eef67 100644
|
||
|
|
--- a/fs/ext4/namei.c
|
||
|
|
+++ b/fs/ext4/namei.c
|
||
|
|
@@ -126,7 +126,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
|
||
|
|
struct ext4_dir_entry *dirent;
|
||
|
|
int is_dx_block = 0;
|
||
|
|
|
||
|
|
- if (block >= inode->i_size) {
|
||
|
|
+ if (block >= inode->i_size >> inode->i_blkbits) {
|
||
|
|
ext4_error_inode(inode, func, line, block,
|
||
|
|
"Attempting to read directory block (%u) that is past i_size (%llu)",
|
||
|
|
block, inode->i_size);
|