summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2016-10-28 11:49:03 +0200
committerRichard Weinberger <richard@nod.at>2016-10-28 14:48:31 +0200
commita00052a296e54205cf238c75bd98d17d5d02a6db (patch)
tree917478861c1caf6874e20db93d86b8caa689ccc6
parent40b6e61ac72e99672e47cdb99c8d7d226004169b (diff)
downloadlinux-stable-a00052a296e54205cf238c75bd98d17d5d02a6db.tar.gz
linux-stable-a00052a296e54205cf238c75bd98d17d5d02a6db.tar.bz2
linux-stable-a00052a296e54205cf238c75bd98d17d5d02a6db.zip
ubifs: Fix regression in ubifs_readdir()
Commit c83ed4c9dbb35 ("ubifs: Abort readdir upon error") broke overlayfs support because the fix exposed an internal error code to VFS. Reported-by: Peter Rosin <peda@axentia.se> Tested-by: Peter Rosin <peda@axentia.se> Reported-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> Tested-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> Fixes: c83ed4c9dbb35 ("ubifs: Abort readdir upon error") Cc: stable@vger.kernel.org Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--fs/ubifs/dir.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index bd4a5e8ce441..ca16c5d7bab1 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -543,6 +543,14 @@ out:
if (err != -ENOENT)
ubifs_err(c, "cannot find next direntry, error %d", err);
+ else
+ /*
+ * -ENOENT is a non-fatal error in this context, the TNC uses
+ * it to indicate that the cursor moved past the current directory
+ * and readdir() has to stop.
+ */
+ err = 0;
+
/* 2 is a special value indicating that there are no more direntries */
ctx->pos = 2;