Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jakob Unterwurzacher <jakobunt@gmail.com>
Tested-by: Marios Titas <redneb@gmx.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 0b05b18381ee ("fuse: implement NFS-like readdirplus support")
Cc: <stable@vger.kernel.org> # v3.9

+2 -1
+2 -1
fs/fuse/dir.c
··· 1308 1308 */ 1309 1309 over = !dir_emit(ctx, dirent->name, dirent->namelen, 1310 1310 dirent->ino, dirent->type); 1311 - ctx->pos = dirent->off; 1311 + if (!over) 1312 + ctx->pos = dirent->off; 1312 1313 } 1313 1314 1314 1315 buf += reclen;