From: Gao Xiang <hsiangkao@linux.alibaba.com>
Date: Thu, 3 Aug 2023 05:00:31 +0000 (+0800)
Subject: erofs-utils: dump: use a new subdir context for erofs_get_pathname()
X-Git-Tag: v1.8~213
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45b43e5d3c912210e82fe41ab37cd7bee7adfd39;p=platform%2Fupstream%2Ferofs-utils.git

erofs-utils: dump: use a new subdir context for erofs_get_pathname()

It's absolutely unsafe to reuse struct erofs_dir_context.  Also,
we'd like to refactor erofs_get_pathname() in the future.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230803050031.130026-1-hsiangkao@linux.alibaba.com
---

diff --git a/lib/dir.c b/lib/dir.c
index e8df9f7..fff0bc0 100644
--- a/lib/dir.c
+++ b/lib/dir.c
@@ -217,10 +217,16 @@ static int erofs_get_pathname_iter(struct erofs_dir_context *ctx)
 		}
 
 		if (S_ISDIR(dir.i_mode)) {
-			ctx->dir = &dir;
-			pathctx->pos = pos + len + 1;
-			ret = erofs_iterate_dir(ctx, false);
-			pathctx->pos = pos;
+			struct erofs_get_pathname_context nctx = {
+				.ctx.flags = 0,
+				.ctx.dir = &dir,
+				.ctx.cb = erofs_get_pathname_iter,
+				.target_nid = pathctx->target_nid,
+				.buf = pathctx->buf,
+				.size = pathctx->size,
+				.pos = pos + len + 1,
+			};
+			ret = erofs_iterate_dir(&nctx.ctx, false);
 			if (ret == EROFS_PATHNAME_FOUND) {
 				pathctx->buf[pos++] = '/';
 				strncpy(pathctx->buf + pos, dname, len);