[PATCH] erofs-utils: lib: check NULL from erofs_rebuild_get_dentry()

Vansh Choudhary
2026-04-20T17:48:05Z

erofs_rebuild_get_dentry() returns NULL when the input path
normalizes to nothing (".", "/", "//", or paths that collapse via
".."). The tar hardlink branch and the S3 import loop only check
IS_ERR() and then dereference the result.

Reject a hardlink target that resolves to root with -EISDIR, and
treat a root-normalized S3 key as the root inode itself.

Fixes: 95d315fd7958 ("erofs-utils: introduce tarerofs")
Fixes: 29728ba8f6f6 ("erofs-utils: mkfs: support EROFS meta-only image generation from S3")
Signed-off-by: Vansh Choudhary <ch@vnsh.in>
---
lib/remotes/s3.c | 5 ++++-
lib/tar.c | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/remotes/s3.c b/lib/remotes/s3.c
index e552ed0..d386a32 100644
--- a/lib/remotes/s3.c
+++ b/lib/remotes/s3.c
@@ -1129,7 +1129,10 @@ int s3erofs_build_trees(struct erofs_importer *im, struct erofs_s3 *s3,
ret = PTR_ERR(d);
goto err_iter;
}
- if (d->type == EROFS_FT_DIR) {
+ if (!d) {
+ inode = root;
+ inode->i_mode = S_IFDIR | 0755;
+ } else if (d->type == EROFS_FT_DIR) {
inode = d->inode;
inode->i_mode = S_IFDIR | 0755;
} else {
diff --git a/lib/tar.c b/lib/tar.c
index d2dc141..b08bd77 100644
--- a/lib/tar.c
+++ b/lib/tar.c
@@ -1024,6 +1024,10 @@ out_eot:
ret = PTR_ERR(d2);
goto out;
}
+ if (!d2) {
+ ret = -EISDIR;
+ goto out;
+ }
if (d2->type == EROFS_FT_UNKNOWN) {
ret = -ENOENT;
goto out;
--
2.43.0