mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-10 12:57:06 +09:00
ANDROID: ext4: fix mis-merge with encrypt+casefold support
Fix a mis-merge between upstream commit7303cb5bfe("ext4: fix checking of directory entry validity for inline directories") and ANDROID commit705a3e5b18("ANDROID: ext4: Handle casefolding with encryption"). Fixes:e6d1601bb0("Merge 5.9-rc2 into android-mainline") Bug: 161184936 Cc: Daniel Rosenberg <drosen@google.com> Cc: Paul Lawrence <paullawrence@google.com> Cc: Sandeep Patil <sspatil@google.com> Change-Id: I6b1e51ba24ba35b15821c856b0d8ebb860a8f8cb Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
@@ -1474,7 +1474,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
|
||||
/* found a match - just to be sure, do
|
||||
* a full check */
|
||||
if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf,
|
||||
bh->b_size, lblk, offset))
|
||||
buf_size, lblk, offset))
|
||||
return -1;
|
||||
*res_dir = de;
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user