diff options
| author | Richard Weinberger <richard@nod.at> | 2016-10-28 11:49:03 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:50:57 +0000 |
| commit | ed21d9ee0cb64c6cbb7f376bd9e90123e4947332 (patch) | |
| tree | db566b0eb1aaa1147ddd7c6e1c0caa6b468f083d /fs | |
| parent | 56d95c049be3063654f8d184e069edce371728f4 (diff) | |
| download | linux-ed21d9ee0cb64c6cbb7f376bd9e90123e4947332.tar.gz linux-ed21d9ee0cb64c6cbb7f376bd9e90123e4947332.tar.bz2 linux-ed21d9ee0cb64c6cbb7f376bd9e90123e4947332.zip | |
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.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/dir.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ca4eb9427bdc..348dcb2d2e8f 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -477,6 +477,14 @@ static int ubifs_readdir(struct file *file, void *dirent, filldir_t filldir) 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; |