aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2001-06-01 21:57:51 +0000
committerKris Kennaway <kris@FreeBSD.org>2001-06-01 21:57:51 +0000
commitbd70e161efe49b86fb490e8ad127d031d8d6f3fc (patch)
tree7e45b2139b4d7d51e40348767bbd1c5a696f07ac
parent9aa793839e167fea6dc093c33bdd6ca66bbc3efa (diff)
downloadsrc-bd70e161efe49b86fb490e8ad127d031d8d6f3fc.tar.gz
src-bd70e161efe49b86fb490e8ad127d031d8d6f3fc.zip
MFC: Protect the remaining instance of chdir() using fts_safe_changedir().
Notes
Notes: svn path=/releng/4.3/; revision=77600
-rw-r--r--lib/libc/gen/fts.c37
1 files changed, 12 insertions, 25 deletions
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 491dca60d8f9..4af2c3e0711d 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -43,7 +43,6 @@ static char rcsid[] = "$FreeBSD$";
#endif
#endif /* LIBC_SCCS and not lint */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
@@ -64,7 +63,7 @@ static void fts_padjust __P((FTS *, FTSENT *));
static int fts_palloc __P((FTS *, size_t));
static FTSENT *fts_sort __P((FTS *, FTSENT *, int));
static u_short fts_stat __P((FTS *, FTSENT *, int));
-static int fts_safe_changedir __P((FTS *, FTSENT *, int));
+static int fts_safe_changedir __P((FTS *, FTSENT *, int, char *));
#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
@@ -72,7 +71,6 @@ static int fts_safe_changedir __P((FTS *, FTSENT *, int));
#define ISSET(opt) (sp->fts_options & (opt))
#define SET(opt) (sp->fts_options |= (opt))
-#define CHDIR(sp, path) (!ISSET(FTS_NOCHDIR) && chdir(path))
#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
/* fts_build flags */
@@ -276,8 +274,8 @@ FTSENT *
fts_read(sp)
register FTS *sp;
{
- register FTSENT *p, *tmp;
struct stat sb;
+ register FTSENT *p, *tmp;
register int instr;
register char *t;
int saved_errno;
@@ -353,7 +351,7 @@ fts_read(sp)
* FTS_STOP or the fts_info field of the node.
*/
if (sp->fts_child != NULL) {
- if (fts_safe_changedir(sp, p, -1)) {
+ if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
p->fts_errno = errno;
p->fts_flags |= FTS_DONTCHDIR;
for (p = sp->fts_child; p != NULL;
@@ -452,22 +450,9 @@ name: t = sp->fts_path + NAPPEND(p->fts_parent);
}
(void)_close(p->fts_symfd);
} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
- !ISSET(FTS_NOCHDIR)) {
- if (chdir("..")) {
- SET(FTS_STOP);
- return (NULL);
- }
- if (stat(".", &sb) == -1) {
- SET(FTS_STOP);
- return (NULL);
- } else {
- if (sb.st_ino != p->fts_parent->fts_ino ||
- sb.st_dev != p->fts_parent->fts_dev) {
- errno = ENOENT;
- SET(FTS_STOP);
- return (NULL);
- }
- }
+ fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
+ SET(FTS_STOP);
+ return (NULL);
}
p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
return (sp->fts_cur = p);
@@ -654,7 +639,7 @@ fts_build(sp, type)
*/
cderrno = 0;
if (nlinks || type == BREAD) {
- if (fts_safe_changedir(sp, cur, dirfd(dirp))) {
+ if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
if (nlinks && type == BREAD)
cur->fts_errno = errno;
cur->fts_flags |= FTS_DONTCHDIR;
@@ -820,7 +805,8 @@ mem1: saved_errno = errno;
*/
if (descend && (type == BCHILD || !nitems) &&
(cur->fts_level == FTS_ROOTLEVEL ?
- FCHDIR(sp, sp->fts_rfd) : CHDIR(sp, ".."))) {
+ FCHDIR(sp, sp->fts_rfd) :
+ fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
cur->fts_info = FTS_ERR;
SET(FTS_STOP);
return (NULL);
@@ -1083,10 +1069,11 @@ fts_maxarglen(argv)
* Assumes p->fts_dev and p->fts_ino are filled in.
*/
static int
-fts_safe_changedir(sp, p, fd)
+fts_safe_changedir(sp, p, fd, path)
FTS *sp;
FTSENT *p;
int fd;
+ char *path;
{
int ret, oerrno, newfd;
struct stat sb;
@@ -1094,7 +1081,7 @@ fts_safe_changedir(sp, p, fd)
newfd = fd;
if (ISSET(FTS_NOCHDIR))
return (0);
- if (fd < 0 && (newfd = _open(p->fts_accpath, O_RDONLY, 0)) < 0)
+ if (fd < 0 && (newfd = _open(path, O_RDONLY, 0)) < 0)
return (-1);
if (fstat(newfd, &sb)) {
ret = -1;