xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ext4: verify dir block before splitting it"

Browse Source 
This reverts commit da2f059192 which is
commit 46c116b920ebec58031f0a78c5ea9599b0d2a371 upstream,  as it breaks
the build in Android kernel builds due to out-of-tree changes that were
never merged upstream.

Bug: 236690716
Fixes: 0e8e989142 ("Merge 5.10.121 into android12-5.10-lts")
Cc: Daniel Rosenberg <drosen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I08929715fb488a7d1977300e84d0940a9bf4dc98
This commit is contained in:
Greg Kroah-Hartman
2022-07-27 13:58:06 +02:00
parent 0e8e989142
commit f004760d69
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fs/ext4/namei.c
View File

@@ -280,9 +280,9 @@ static struct dx_frame *dx_probe(struct ext4_filename *fname,
struct dx_hash_info *hinfo, struct dx_hash_info *hinfo,
struct dx_frame *frame); struct dx_frame *frame);
static void dx_release(struct dx_frame *frames); static void dx_release(struct dx_frame *frames);
static int dx_make_map(struct inode *dir, struct buffer_head *bh, static int dx_make_map(struct inode *dir, struct ext4_dir_entry_2 *de,
struct dx_hash_info *hinfo, unsigned blocksize, struct dx_hash_info *hinfo,
struct dx_map_entry *map_tail); struct dx_map_entry map[]);
static void dx_sort_map(struct dx_map_entry *map, unsigned count); static void dx_sort_map(struct dx_map_entry *map, unsigned count);
static struct ext4_dir_entry_2 *dx_move_dirents(struct inode *dir, char *from, static struct ext4_dir_entry_2 *dx_move_dirents(struct inode *dir, char *from,
char *to, struct dx_map_entry *offsets, char *to, struct dx_map_entry *offsets,
@@ -1259,23 +1259,15 @@ static inline int search_dirblock(struct buffer_head *bh,
* Create map of hash values, offsets, and sizes, stored at end of block. * Create map of hash values, offsets, and sizes, stored at end of block.
* Returns number of entries mapped. * Returns number of entries mapped.
*/ */
static int dx_make_map(struct inode *dir, struct buffer_head *bh, static int dx_make_map(struct inode *dir, struct ext4_dir_entry_2 *de,
struct dx_hash_info *hinfo, unsigned blocksize, struct dx_hash_info *hinfo,
struct dx_map_entry *map_tail) struct dx_map_entry *map_tail)
{ {
int count = 0; int count = 0;
struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)bh->b_data; char *base = (char *) de;
unsigned int buflen = bh->b_size;
char *base = bh->b_data;
struct dx_hash_info h = *hinfo; struct dx_hash_info h = *hinfo;
if (ext4_has_metadata_csum(dir->i_sb)) while ((char *) de < base + blocksize) {
buflen -= sizeof(struct ext4_dir_entry_tail);
while ((char *) de < base + buflen) {
if (ext4_check_dir_entry(dir, NULL, de, bh, base, buflen,
((char *)de) - base))
return -EFSCORRUPTED;
if (de->name_len && de->inode) { if (de->name_len && de->inode) {
if (ext4_hash_in_dirent(dir)) if (ext4_hash_in_dirent(dir))
h.hash = EXT4_DIRENT_HASH(de); h.hash = EXT4_DIRENT_HASH(de);
@@ -1288,7 +1280,8 @@ static int dx_make_map(struct inode *dir, struct buffer_head *bh,
count++; count++;
cond_resched(); cond_resched();
} }
de = ext4_next_entry(de, dir->i_sb->s_blocksize); /* XXX: do we need to check rec_len == 0 case? -Chris */
de = ext4_next_entry(de, blocksize);
} }
return count; return count;
} }
@@ -1958,11 +1951,8 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
/* create map in the end of data2 block */ /* create map in the end of data2 block */
map = (struct dx_map_entry *) (data2 + blocksize); map = (struct dx_map_entry *) (data2 + blocksize);
count = dx_make_map(dir, *bh, hinfo, map); count = dx_make_map(dir, (struct ext4_dir_entry_2 *) data1,
if (count < 0) { blocksize, hinfo, map);
err = count;
goto journal_error;
}
map -= count; map -= count;
dx_sort_map(map, count); dx_sort_map(map, count);
/* Ensure that neither split block is over half full */ /* Ensure that neither split block is over half full */