Commit c6cdd514 authored by Miklos Szeredi's avatar Miklos Szeredi

fuse: fix READDIRPLUS skipping an entry

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: default avatarJakob Unterwurzacher <jakobunt@gmail.com>
Tested-by: Marios Titas <redneb@gmx.com> 
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Fixes: 0b05b183 ("fuse: implement NFS-like readdirplus support")
Cc: <stable@vger.kernel.org> # v3.9
parent bb176f67
...@@ -1308,7 +1308,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file, ...@@ -1308,7 +1308,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file,
*/ */
over = !dir_emit(ctx, dirent->name, dirent->namelen, over = !dir_emit(ctx, dirent->name, dirent->namelen,
dirent->ino, dirent->type); dirent->ino, dirent->type);
ctx->pos = dirent->off; if (!over)
ctx->pos = dirent->off;
} }
buf += reclen; buf += reclen;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment