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>

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;