TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-09-10 07:44:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: skip ENAMETOOLONG for whiteouts lookup

Browse Source 
adding the .wh. prefix could cause the lookup to cross the f_namemax
limit and fail the lookup with ENAMETOOLONG.  If the lookup fails with
ENAMETOOLONG then the whiteout file doesn't exist.

Closes: https://github.com/containers/fuse-overlayfs/issues/236

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-10-04 16:33:09 +02:00
parent 421c64db78
commit d34833dfb3
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@ -1365,7 +1365,7 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
int r; int r;
r = it->ds->file_exists (it, whiteout_path); r = it->ds->file_exists (it, whiteout_path);
if (r < 0 && errno != ENOENT && errno != ENOTDIR) if (r < 0 && errno != ENOENT && errno != ENOTDIR && errno != ENAMETOOLONG)
return NULL; return NULL;
if (r == 0) if (r == 0)
@ -1546,7 +1546,7 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
stop_lookup = true; stop_lookup = true;
ret = it->ds->file_exists (it, parent_whiteout_path); ret = it->ds->file_exists (it, parent_whiteout_path);
if (ret < 0 && errno != ENOENT && errno != ENOTDIR) if (ret < 0 && errno != ENOENT && errno != ENOTDIR && errno != ENAMETOOLONG)
return NULL; return NULL;
if (ret == 0) if (ret == 0)
@ -1600,7 +1600,7 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
strconcat3 (node_path, PATH_MAX, n->path, "/", dent->d_name); strconcat3 (node_path, PATH_MAX, n->path, "/", dent->d_name);
ret = it->ds->file_exists (it, whiteout_path); ret = it->ds->file_exists (it, whiteout_path);
if (ret < 0 && errno != ENOENT && errno != ENOTDIR) if (ret < 0 && errno != ENOENT && errno != ENOTDIR && errno != ENAMETOOLONG)
{ {
it->ds->closedir (dp); it->ds->closedir (dp);
return NULL; return NULL;
@ -1908,7 +1908,7 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
strconcat3 (whpath, PATH_MAX, pnode->path, "/.wh.", name); strconcat3 (whpath, PATH_MAX, pnode->path, "/.wh.", name);
ret = it->ds->file_exists (it, whpath); ret = it->ds->file_exists (it, whpath);
if (ret < 0 && errno != ENOENT && errno != ENOTDIR) if (ret < 0 && errno != ENOENT && errno != ENOTDIR && errno != ENAMETOOLONG)
return NULL; return NULL;
if (ret == 0) if (ret == 0)
{ {
@ -1937,7 +1937,7 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
strconcat3 (whpath, PATH_MAX, pnode->path, "/.wh.", name); strconcat3 (whpath, PATH_MAX, pnode->path, "/.wh.", name);
ret = it->ds->file_exists (it, whpath); ret = it->ds->file_exists (it, whpath);
if (ret < 0 && errno != ENOENT && errno != ENOTDIR) if (ret < 0 && errno != ENOENT && errno != ENOTDIR && errno != ENAMETOOLONG)
return NULL; return NULL;
if (ret == 0) if (ret == 0)
node = make_whiteout_node (path, name); node = make_whiteout_node (path, name);