From: Richard Weinberger <richard@nod.at>
Date: Fri, 28 Oct 2016 09:49:03 +0000 (+0200)
Subject: ubifs: Fix regression in ubifs_readdir()
X-Git-Tag: v3.16.40~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dba8e88e9827d87f1210c8ae392542508aecbd13;p=thirdparty%2Fkernel%2Fstable.git

ubifs: Fix regression in ubifs_readdir()

commit a00052a296e54205cf238c75bd98d17d5d02a6db upstream.

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")
Signed-off-by: Richard Weinberger <richard@nod.at>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 12caf1ab5f5ad..062f0d63dec62 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -448,6 +448,14 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx)
 out:
 	if (err != -ENOENT)
 		ubifs_err("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;
+
 
 	kfree(file->private_data);
 	file->private_data = NULL;