Skip to contentSkip to conversation

erofs-utils: lib: fix erofs_iterate_dir() recursion

PATCH In review Jingbo Xu 2 participants 4 messages Jul 22, 2023 Library code

lore
Share & tools
lore

Jingbo Xu

author
#0 lore raw

PATCH v2 1/1 erofs-utils: lib: fix erofs_iterate_dir() recursion

ctx->dir may have changed when ctx is reused along erofs_iterate_dir() recursion.

---
changes since last version:
since traverse_dirents() can be called multiple times in one single erofs_iterate_dir() call, ctx->dir may have changed at the entry of traverse_dirents(). The previous v1 shall be deprecated.

v1: https://lore.kernel.org/all/[email protected]/

---
 lib/dir.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
lib/dir.c +5 -4
index abbf27a..535204b 100644
@@ -5,6 +5,7 @@
 #include "erofs/dir.h"
 
 static int traverse_dirents(struct erofs_dir_context *ctx,
+			    struct erofs_inode *dir,
 			    void *dentry_blk, unsigned int lblk,
 			    unsigned int next_nameoff, unsigned int maxsize,
 			    bool fsck)
@@ -76,7 +77,7 @@ static int traverse_dirents(struct erofs_dir_context *ctx,
 					goto out;
 				}
 				ctx->flags |= EROFS_READDIR_DOTDOT_FOUND;
-				if (sbi.root_nid == ctx->dir->nid) {
+				if (sbi.root_nid == dir->nid) {
 					ctx->pnid = sbi.root_nid;
 					ctx->flags |= EROFS_READDIR_VALID_PNID;
 				}
@@ -95,7 +96,7 @@ static int traverse_dirents(struct erofs_dir_context *ctx,
 				}
 
 				ctx->flags |= EROFS_READDIR_DOT_FOUND;
-				if (fsck && ctx->de_nid != ctx->dir->nid) {
+				if (fsck && ctx->de_nid != dir->nid) {
 					errmsg = "corrupted `.' dirent";
 					goto out;
 				}
@@ -115,7 +116,7 @@ static int traverse_dirents(struct erofs_dir_context *ctx,
 out:
 	if (ret && !silent)
 		erofs_err("%s @ nid %llu, lblk %u, index %lu",
-			  errmsg, ctx->dir->nid | 0ULL, lblk,
+			  errmsg, dir->nid | 0ULL, lblk,
 			  (de - (struct erofs_dirent *)dentry_blk) | 0UL);
 	return ret;
 }
@@ -153,7 +154,7 @@ int erofs_iterate_dir(struct erofs_dir_context *ctx, bool fsck)
 				  nameoff, dir->nid | 0ULL, lblk);
 			return -EFSCORRUPTED;
 		}
-		err = traverse_dirents(ctx, buf, lblk, nameoff, maxsize, fsck);
+		err = traverse_dirents(ctx, dir, buf, lblk, nameoff, maxsize, fsck);
 		if (err)
 			break;
 		pos += maxsize;
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Jingbo,

Quoted 11 lines · Jingbo Xu

ctx->dir may have changed when ctx is reused along erofs_iterate_dir() recursion.

---
changes since last version:
since traverse_dirents() can be called multiple times in one single erofs_iterate_dir() call, ctx->dir may have changed at the entry of traverse_dirents(). The previous v1 shall be deprecated.

v1: https://lore.kernel.org/all/[email protected]/

I plan to drop this commit directly. struct erofs_dir_context is not designed for reusing recursively. It's not the case just due to ctx->dir but also internal states.

You need to build another ctx for recursion.

Thanks,
Gao Xiang

author
#2 lore raw
Quoted 13 lines · Gao Xiang

Hi Jingbo,

Quoted 10 lines · Jingbo Xu

ctx->dir may have changed when ctx is reused along erofs_iterate_dir() recursion.

---
changes since last version:
since traverse_dirents() can be called multiple times in one single erofs_iterate_dir() call, ctx->dir may have changed at the entry of traverse_dirents(). The previous v1 shall be deprecated.

Quoted 7 lines
Quoted 1 line

v1: https://lore.kernel.org/all/[email protected]/

I plan to drop this commit directly. struct erofs_dir_context is not designed for reusing recursively. It's not the case just due to ctx->dir but also internal states.

You need to build another ctx for recursion.

It seems that ctx is reused to avoid stack overflow. So we have to allocate ctx on heap to avoid stack overflow?

Signature · 2 lines
Thanks,
Jingbo
#3 lore raw
Quoted 18 lines · Jingbo Xu
Quoted 15 lines · Gao Xiang

Hi Jingbo,

Quoted 11 lines · Jingbo Xu

ctx->dir may have changed when ctx is reused along erofs_iterate_dir() recursion.

---
changes since last version:
since traverse_dirents() can be called multiple times in one single erofs_iterate_dir() call, ctx->dir may have changed at the entry of traverse_dirents(). The previous v1 shall be deprecated.

v1: https://lore.kernel.org/all/[email protected]/

Quoted 8 lines
Quoted 5 lines

I plan to drop this commit directly. struct erofs_dir_context is not designed for reusing recursively. It's not the case just due to ctx->dir but also internal states.

You need to build another ctx for recursion.

It seems that ctx is reused to avoid stack overflow. So we have to allocate ctx on heap to avoid stack overflow?

It'd be better to use heap space for allocation in principle (even avoid recursion), but I think it's just some userspace code and stack space to enough in general.

Thanks,
Gao Xiang

Quoted 4 lines
Signature · 3 lines
-- 
Thanks,
Jingbo