Commit b7be20b0 authored Oct 25, 2017 by Miklos Szeredi Committed by Greg Kroah-Hartman Nov 02, 2017

fuse: fix READDIRPLUS skipping an entry



commit c6cdd51404b7ac12dd95173ddfc548c59ecf037f upstream.

Marios Titas running a Haskell program noticed a problem with fuse's
readdirplus: when it is interrupted by a signal, it skips one directory
entry.

The reason is that fuse erronously updates ctx->pos after a failed
dir_emit().

The issue originates from the patch adding readdirplus support.

Reported-by: Jakob Unterwurzacher <jakobunt@gmail.com>
Tested-by: Marios Titas <redneb@gmx.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 0b05b183 ("fuse: implement NFS-like readdirplus support")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 458a78ab

fs/fuse/dir.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1371,6 +1371,7 @@ static int parse_dirplusfile(char buf, size_t nbytes, struct file file,
		*/
		over = !dir_emit(ctx, dirent->name, dirent->namelen,
		dirent->ino, dirent->type);
		if (!over)
		ctx->pos = dirent->off;
		}