diff options
author | jilles <jilles@FreeBSD.org> | 2014-06-06 13:37:40 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2014-06-06 13:37:40 +0000 |
commit | 83925746a3e67ab79613b86ee4d2703eaa191e19 (patch) | |
tree | 5085eb14158ef337772716b2714b8319bb6cd680 | |
parent | 2c6af1420a13bc7ad858b0c83fc17b06fb9d6bea (diff) | |
download | FreeBSD-src-83925746a3e67ab79613b86ee4d2703eaa191e19.zip FreeBSD-src-83925746a3e67ab79613b86ee4d2703eaa191e19.tar.gz |
MFC r264417: realpath(): Properly fail "." or ".." components after
non-directories.
If realpath() is called on pathnames like "/dev/null/." or "/dev/null/..",
it should fail with [ENOTDIR]. Pathnames like "/dev/null/" already failed as
they should.
Also, put the check for non-directories after lstatting the previous
component instead of when the empty component (consecutive or trailing
slashes) is detected, saving an lstat() call and some lines of code.
PR: 82980
-rw-r--r-- | lib/libc/stdlib/realpath.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index a2a9329..c4bd953 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -132,26 +132,7 @@ realpath(const char * __restrict path, char * __restrict resolved) resolved[resolved_len] = '\0'; } if (next_token[0] == '\0') { - /* - * Handle consequential slashes. The path - * before slash shall point to a directory. - * - * Only the trailing slashes are not covered - * by other checks in the loop, but we verify - * the prefix for any (rare) "//" or "/\0" - * occurrence to not implement lookahead. - */ - if (lstat(resolved, &sb) != 0) { - if (m) - free(resolved); - return (NULL); - } - if (!S_ISDIR(sb.st_mode)) { - if (m) - free(resolved); - errno = ENOTDIR; - return (NULL); - } + /* Handle consequential slashes. */ continue; } else if (strcmp(next_token, ".") == 0) @@ -236,6 +217,11 @@ realpath(const char * __restrict path, char * __restrict resolved) } } left_len = strlcpy(left, symlink, sizeof(left)); + } else if (!S_ISDIR(sb.st_mode) && p != NULL) { + if (m) + free(resolved); + errno = ENOTDIR; + return (NULL); } } |