[PATCH] f2fs: fix to return 0 if err == -ENOENT in f2fs_readdir

[PATCH] f2fs: fix to return 0 if err == -ENOENT in f2fs_readdir

[Yunlong Song]

Commit 57b62d29ad5b384775974973087d47755a8c6fcc ("f2fs: fix to report
error in f2fs_readdir") causes f2fs_readdir to return -ENOENT when
get_lock_data_page returns -ENOENT. However, the original logic is to
continue when get_lock_data_page returns -ENOENT, but it forgets to
reset err to 0.

This will cause getdents64 incorretly return -ENOENT when lastdirent is
NULL in getdents64. This will lead to a wrong return value for syscall
caller.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
---
 fs/f2fs/dir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 0ad7b9a..3ed6145 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -886,6 +886,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
 		kunmap(dentry_page);
 		f2fs_put_page(dentry_page, 1);
 	}
+	err = 0;
 out:
 	fscrypt_fname_free_buffer(&fstr);
 	return err;
-- 
1.8.5.2

Re: [PATCH] f2fs: fix to return 0 if err == -ENOENT in f2fs_readdir

[Chao Yu]

On 2016/4/27 20:32, Yunlong Song wrote:
> Commit 57b62d29ad5b384775974973087d47755a8c6fcc ("f2fs: fix to report
> error in f2fs_readdir") causes f2fs_readdir to return -ENOENT when
> get_lock_data_page returns -ENOENT. However, the original logic is to
> continue when get_lock_data_page returns -ENOENT, but it forgets to
> reset err to 0.
> 
> This will cause getdents64 incorretly return -ENOENT when lastdirent is
> NULL in getdents64. This will lead to a wrong return value for syscall
> caller.
> 
> Signed-off-by: Yunlong Song <yunlong.song@huawei.com>

Reviewed-by: Chao Yu <yuchao0@huawei.com>