From 0ecd21258e24fec185c157520435783780a1ad8f Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 26 Feb 2015 17:12:30 +0100 Subject: [PATCH] libfuse: fix handling of '.' and '..' in highlevel readdirplus --- ChangeLog | 2 ++ lib/fuse.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 983a7d9..1a20560 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * libfuse: fix fuse_remove_signal_handlers() to properly restore the default signal handler. Reported by: Chris Johnson + * libfuse: fix handling of '.' and '..' in highlevel readdirplus + 2014-07-21 Miklos Szeredi * libfuse: highlevel API: fix directory file handle passed to diff --git a/lib/fuse.c b/lib/fuse.c index 75d657c..2f1c85e 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -3418,6 +3418,12 @@ static int fill_dir(void *dh_, const char *name, const struct stat *statp, return 0; } +static int is_dot_or_dotdot(const char *name) +{ + return name[0] == '.' && (name[1] == '\0' || + (name[1] == '.' && name[2] == '\0')); +} + static int fill_dir_plus(void *dh_, const char *name, const struct stat *statp, off_t off, enum fuse_fill_dir_flags flags) { @@ -3437,10 +3443,12 @@ static int fill_dir_plus(void *dh_, const char *name, const struct stat *statp, if (off && statp && (flags & FUSE_FILL_DIR_PLUS)) { e.attr = *statp; - res = do_lookup(f, dh->nodeid, name, &e); - if (res) { - dh->error = res; - return 1; + if (!is_dot_or_dotdot(name)) { + res = do_lookup(f, dh->nodeid, name, &e); + if (res) { + dh->error = res; + return 1; + } } } else { e.attr.st_ino = FUSE_UNKNOWN_INO; -- 2.11.4.GIT