]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ubifs: Fix regression in ubifs_readdir()
authorRichard Weinberger <richard@nod.at>
Fri, 28 Oct 2016 09:49:03 +0000 (11:49 +0200)
committerRichard Weinberger <richard@nod.at>
Fri, 28 Oct 2016 12:48:31 +0000 (14:48 +0200)
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>
fs/ubifs/dir.c

index bd4a5e8ce4410bb7e6c7cb327697479ee102b853..ca16c5d7bab1726af305fa3a1a534ab5bc78cb4e 100644 (file)
@@ -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;