Commit dc70a200 authored Oct 28, 2016 by Richard Weinberger Committed by Greg Kroah-Hartman Nov 10, 2016

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0222377b

fs/ubifs/dir.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,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;