ocfs2: add bounds checking to ocfs2_check_dir_entry()
PATCH v4 1/1 ocfs2: add bounds checking to ocfs2_check_dir_entry()
This adds sanity checks for ocfs2_dir_entry to make sure all members of ocfs2_dir_entry don't stray beyond valid memory region.
--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
fs/ocfs2/dir.c +22 -12
@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry (struct inode * dir, -struct ocfs2_dir_entry * de, -struct buffer_head * bh, +static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;
@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;
@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }
@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;
@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }
@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;
@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;
@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }
@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Signature · 1 line
2.34.1
Heming Zhao
reviewerQuoted 20 lines · lei lu
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,
fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;
from this patch, there are two cases for the parameter 'buf':
1>
'de' is the same as 'bh', de & bh both are the latest dir_entry offset. the sanity check always passes below cases. e.g:
- ocfs2_search_dirblock()
- ocfs2_find_dir_space_id()
2>
'de' is different with 'bh', bh is the first dir_entry offset, de is the latest offset. these cases should be the expected code paths, e.g:
- __ocfs2_delete_entry()
- ocfs2_dir_foreach_blk_id()
- ocfs2_dir_foreach_blk_el()
- ocfs2_find_dir_space_el()
If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Quoted 35 lines · Heming Zhao
Quoted 20 lines · lei lu
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;from this patch, there are two cases for the parameter 'buf':
Quoted 5 lines
1>
'de' is the same as 'bh', de & bh both are the latestdir_entryoffset. the sanity check always passes below cases. e.g:
-ocfs2_search_dirblock()
-ocfs2_find_dir_space_id()
Thanks for your time.
Sorry, I don't quite understand what you mean.
I think 'de' is not the same as 'bh'. e.g.:
- ocfs2_search_dirblock(): de is the latest dir_entry offset, bh is the ocfs2_dinode offset, buf is the first dir_entry offset
- ocfs2_find_dir_space_id(): de is the latest dir_entry offset, bh is the ocfs2_dinode offset, buf is the first dir_entry offset
Thanks,
LL
Quoted 104 lines
2>
'de' is different with 'bh', bh is the firstdir_entryoffset, de is the latest offset. these cases should be the expected code paths, e.g:
-__ocfs2_delete_entry()
-ocfs2_dir_foreach_blk_id()
-ocfs2_dir_foreach_blk_el()
-ocfs2_find_dir_space_el()If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Heming Zhao
reviewerQuoted 42 lines · lei lu
Quoted 35 lines · Heming Zhao
Quoted 20 lines · lei lu
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;from this patch, there are two cases for the parameter 'buf':
Quoted 5 lines
1>
'de' is the same as 'bh', de & bh both are the latestdir_entryoffset. the sanity check always passes below cases. e.g:
-ocfs2_search_dirblock()
-ocfs2_find_dir_space_id()
Quoted 3 lines
Thanks for your time.
Sorry, I don't quite understand what you mean.
Oh, sorry for my typo, my mean: 'de' is the same as 'buf' not 'bh'.
The patch code in ocfs2_search_dirblock() is:
if (!ocfs2_check_dir_entry(dir, de, bh, de_buf, bytes, offset))
the de is same as de_buf, so in ocfs2_check_dir_entry() the next_offset becomes
next_offset = rlen; //because "de == de_buf"
In this case, rlen is not the current dir entry end boundary.
Quoted 3 lines
I think 'de' is not the same as 'bh'. e.g.:
-ocfs2_search_dirblock(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffset
buf is not the first dir_entry offset.
Quoted 2 lines
-
ocfs2_find_dir_space_id(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffset
ditto
-Heming
Quoted 108 lines
Thanks,
LLQuoted 104 lines
2>
'de' is different with 'bh', bh is the firstdir_entryoffset, de is the latest offset. these cases should be the expected code paths, e.g:
-__ocfs2_delete_entry()
-ocfs2_dir_foreach_blk_id()
-ocfs2_dir_foreach_blk_el()
-ocfs2_find_dir_space_el()If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Quoted 62 lines · Heming Zhao
Quoted 42 lines · lei lu
Quoted 35 lines · Heming Zhao
Quoted 20 lines · lei lu
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;from this patch, there are two cases for the parameter 'buf':
Quoted 5 lines
1>
'de' is the same as 'bh', de & bh both are the latestdir_entryoffset. the sanity check always passes below cases. e.g:
-ocfs2_search_dirblock()
-ocfs2_find_dir_space_id()Quoted 3 lines
Thanks for your time.
Sorry, I don't quite understand what you mean.
Oh, sorry for my typo, my mean: 'de' is the same as 'buf' not 'bh'.
The patch code in
ocfs2_search_dirblock()is:
if (!ocfs2_check_dir_entry(dir, de, bh,de_buf, bytes, offset))the de is same as
de_buf, so inocfs2_check_dir_entry()thenext_offsetbecomes
next_offset= rlen; //because "de ==de_buf"In this case, rlen is not the current dir entry end boundary.
Quoted 3 lines
I think 'de' is not the same as 'bh'. e.g.:
-ocfs2_search_dirblock(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffset
Quoted 6 lines
buf is not the first
dir_entryoffset.Quoted 2 lines
-
ocfs2_find_dir_space_id(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffsetditto
Oh, you are right, We should use first_de here.
Thanks,
LL
Quoted 111 lines
-Heming
Quoted 108 lines
Thanks,
LLQuoted 104 lines
2>
'de' is different with 'bh', bh is the firstdir_entryoffset, de is the latest offset. these cases should be the expected code paths, e.g:
-__ocfs2_delete_entry()
-ocfs2_dir_foreach_blk_id()
-ocfs2_dir_foreach_blk_el()
-ocfs2_find_dir_space_el()If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Hi,
Do you have further comments and/or suggestions? I will remake the patch to fix the issue in case <1>.
Thanks,
LL
Quoted 187 lines · lei lu
Quoted 62 lines · Heming Zhao
Quoted 42 lines · lei lu
Quoted 35 lines · Heming Zhao
Quoted 20 lines · lei lu
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;from this patch, there are two cases for the parameter 'buf':
Quoted 5 lines
1>
'de' is the same as 'bh', de & bh both are the latestdir_entryoffset. the sanity check always passes below cases. e.g:
-ocfs2_search_dirblock()
-ocfs2_find_dir_space_id()Quoted 3 lines
Thanks for your time.
Sorry, I don't quite understand what you mean.
Oh, sorry for my typo, my mean: 'de' is the same as 'buf' not 'bh'.
The patch code in
ocfs2_search_dirblock()is:
if (!ocfs2_check_dir_entry(dir, de, bh,de_buf, bytes, offset))the de is same as
de_buf, so inocfs2_check_dir_entry()thenext_offsetbecomes
next_offset= rlen; //because "de ==de_buf"In this case, rlen is not the current dir entry end boundary.
Quoted 3 lines
I think 'de' is not the same as 'bh'. e.g.:
-ocfs2_search_dirblock(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffsetQuoted 6 lines
buf is not the first
dir_entryoffset.Quoted 2 lines
-
ocfs2_find_dir_space_id(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffsetditto
Oh, you are right, We should use
first_dehere.Thanks,
LLQuoted 111 lines
-Heming
Quoted 108 lines
Thanks,
LLQuoted 104 lines
2>
'de' is different with 'bh', bh is the firstdir_entryoffset, de is the latest offset. these cases should be the expected code paths, e.g:
-__ocfs2_delete_entry()
-ocfs2_dir_foreach_blk_id()
-ocfs2_dir_foreach_blk_el()
-ocfs2_find_dir_space_el()If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }
Heming Zhao
reviewerQuoted 7 lines · lei lu
Hi,
Do you have further comments and/or suggestions? I will remake the patch to fix the issue in case <1>.
Thanks,
LL
The rest of your patch codes look good to me.
Thanks,
Heming
Quoted 189 lines · lei lu
Quoted 187 lines · Heming Zhao
Quoted 62 lines · lei lu
Quoted 42 lines · Heming Zhao
Quoted 35 lines · lei lu
Quoted 20 lines
This adds sanity checks for
ocfs2_dir_entryto make sure all members ofocfs2_dir_entrydon't stray beyond valid memory region.Signed-off-by lei lu <[email protected]>Reviewed-by Joseph Qi <[email protected]>--- fs/ocfs2/dir.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)fs/ocfs2/dir.c +0
-3@@ -294,13 +294,16 @@ static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len,* bh passed here can be an inode block or a dir data block, depending * on the inode inline data flag. */ -static int ocfs2_check_dir_entry(struct inode * dir, - struct ocfs2_dir_entry * de, - struct buffer_head * bh,fs/ocfs2/dir.c static void ocfs2_dx_dir_name_hash(struct inode *dir, const char *name, int len, · line 306
Quoted 10 lines
fs/ocfs2/dir.c +6
-0+static int ocfs2_check_dir_entry (struct inode *dir, +struct ocfs2_dir_entry *de, +struct buffer_head *bh, +char *buf, +unsigned int size,unsigned long offset) {const char *error_msg =NULL ;const int rlen =le16_to_cpu (de->rec_len); +const unsigned long next_offset = ((char *) de - buf) + rlen;from this patch, there are two cases for the parameter 'buf':
Quoted 5 lines
1>
'de' is the same as 'bh', de & bh both are the latestdir_entryoffset. the sanity check always passes below cases. e.g:
-ocfs2_search_dirblock()
-ocfs2_find_dir_space_id()Quoted 3 lines
Thanks for your time.
Sorry, I don't quite understand what you mean.
Oh, sorry for my typo, my mean: 'de' is the same as 'buf' not 'bh'.
The patch code in
ocfs2_search_dirblock()is:
if (!ocfs2_check_dir_entry(dir, de, bh,de_buf, bytes, offset))the de is same as
de_buf, so inocfs2_check_dir_entry()thenext_offsetbecomesnext_offset = rlen; //because "de == de_buf"In this case, rlen is not the current dir entry end boundary.
Quoted 3 lines
I think 'de' is not the same as 'bh'. e.g.:
-ocfs2_search_dirblock(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffsetQuoted 6 lines
buf is not the first
dir_entryoffset.Quoted 2 lines
-
ocfs2_find_dir_space_id(): de is the latestdir_entryoffset, bh is theocfs2_dinodeoffset, buf is the firstdir_entryoffsetditto
Oh, you are right, We should use
first_dehere.Thanks,
LLQuoted 111 lines
-Heming
Quoted 108 lines
Thanks,
LLQuoted 104 lines
2>
'de' is different with 'bh', bh is the firstdir_entryoffset, de is the latest offset. these cases should be the expected code paths, e.g:
-__ocfs2_delete_entry()
-ocfs2_dir_foreach_blk_id()
-ocfs2_dir_foreach_blk_el()
-ocfs2_find_dir_space_el()If my thinking is right, case <1> needs to be revised to follow the design.
-Heming
Quoted 91 lines
fs/ocfs2/dir.c +16
-9if (unlikely (rlen <OCFS2_DIR_REC_LEN (1 ))) error_msg ="rec_len is smaller than minimal" ;@@ -308,6 +311,11 @@ static int ocfs2_check_dir_entry(struct inode * dir, error_msg ="rec_len % 4 != 0" ; else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) error_msg ="rec_len is too small for name_len" ; + else if (unlikely(next_offset > size)) + error_msg ="directory entry overrun" ; + else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && + next_offset != size) + error_msg = "directory entry too close to end"; else if (unlikely( ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) error_msg ="directory entry across blocks" ;@@ -352,16 +360,16 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh, de_buf = first_de; dlimit = de_buf + bytes; -while (de_buf < dlimit) { +while (de_buf < dlimit -OCFS2_DIR_MEMBER_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ de = (struct ocfs2_dir_entry *) de_buf; -if (de_buf + namelen <= dlimit && +if (de->name + namelen <= dlimit &&ocfs2_match (namelen, name, de)) {/* found a match - just to be sure, do a full check */ -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, de_buf, bytes, offset)) { ret =-1 ; goto bail; }@@ -1138,7 +1146,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, pde =NULL ; de = (struct ocfs2_dir_entry *) first_de;while (i < bytes) { -if (!ocfs2_check_dir_entry (dir, de, bh, i)) { +if (!ocfs2_check_dir_entry (dir, de, bh, first_de, bytes, i)) { status = -EIO ;mlog_errno (status); goto bail;@@ -1635,7 +1643,7 @@ int __ocfs2_add_entry(handle_t *handle,/* These checks should've already been passed by the * prepare function, but I guess we can leave them * here anyway. */ -if (!ocfs2_check_dir_entry (dir, de, insert_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, insert_bh, data_start, size, offset)) { retval = -ENOENT ; goto bail; }@@ -1774,7 +1782,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); -if (!ocfs2_check_dir_entry (inode, de, di_bh, ctx->pos)) { +if (!ocfs2_check_dir_entry (inode, de, di_bh, (char *)data->id_data, +i_size_read (inode), ctx->pos)) {/* On error, skip the f_pos to the end. */ ctx->pos =i_size_read (inode);break ;@@ -1867,7 +1876,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,while (ctx->pos <i_size_read (inode) && offset < sb->s_blocksize) { de = (struct ocfs2_dir_entry *) (bh->b_data + offset); -if (!ocfs2_check_dir_entry (inode, de, bh, offset)) { +if (!ocfs2_check_dir_entry (inode, de, bh, bh->b_data, + sb->s_blocksize, offset)) {/* On error, skip the f_pos to the next block. */ ctx->pos = (ctx->pos | (sb->s_blocksize -1 )) +1 ;@@ -3359,7 +3369,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,while (de_buf < limit) { de = (struct ocfs2_dir_entry *)de_buf; -if (!ocfs2_check_dir_entry (dir, de, di_bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, di_bh, de_buf,i_size_read (dir), offset)) { ret = -ENOENT ; goto out; }@@ -3441,7 +3451,7 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,/* move to next block */ de = (struct ocfs2_dir_entry *) bh->b_data; } -if (!ocfs2_check_dir_entry (dir, de, bh, offset)) { +if (!ocfs2_check_dir_entry (dir, de, bh, bh->b_data, blocksize, offset)) { status = -ENOENT ; goto bail; }