Fixes: 359f392ca53e ("ovl: lookup index entry for copy up origin")
Cc: <stable@xxxxxxxxxxxxxxx> # v4.13
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
fs/overlayfs/namei.c | 4 ++++
1 file changed, 4 insertions(+)
Miklos,
This is a complimentary/fixup patch to the patch currently at the tip of
overlayfs-next. I did not run into ENOENT in my tests, but it seems that
all other places in overlayfs that call lookup_one_len_unlocked() check
the ENOENT return value and treat it the same as negative dentry.
I suppose this could be expected from some file systems?
Amir.
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 49441e8be722..a824e6b157f9 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -507,6 +507,10 @@ static struct dentry *ovl_lookup_index(struct dentry *dentry,
index = lookup_one_len_unlocked(name.name, ofs->indexdir, name.len);
if (IS_ERR(index)) {
err = PTR_ERR(index);
+ if (err == -ENOENT) {
+ index = NULL;
+ goto out;
+ }
pr_warn_ratelimited("overlayfs: failed inode index lookup (ino=%lu, key=%*s, err=%i);\n"
"overlayfs: mount with '-o index=off' to disable inodes index.\n",
d_inode(origin)->i_ino, name.len, name.name,
--
2.7.4