diff options
| author | kib <kib@FreeBSD.org> | 2012-06-14 12:28:43 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2012-06-14 12:28:43 +0000 |
| commit | ecb43693a904db8ebacf6eb8b6e1168f752f5d72 (patch) | |
| tree | 4abe533b87453893f309d9287e4b77f40e862152 /lib/libc | |
| parent | 0e0ae1797174c083bfec06fb3c064ddc5998ee4d (diff) | |
| download | FreeBSD-src-ecb43693a904db8ebacf6eb8b6e1168f752f5d72.zip FreeBSD-src-ecb43693a904db8ebacf6eb8b6e1168f752f5d72.tar.gz | |
Make sure that fstab fd is not leaked on exec.
PR: kern/169023
Submitted by: Jukka Ukkonen <jau iki fi>
MFC after: 1 week
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/fstab.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c index b2c28ad..882c57f 100644 --- a/lib/libc/gen/fstab.c +++ b/lib/libc/gen/fstab.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <errno.h> +#include <fcntl.h> #include <fstab.h> #include <paths.h> #include <stdio.h> @@ -246,6 +247,8 @@ getfsfile(name) int setfsent() { + int fd; + if (_fs_fp) { rewind(_fs_fp); LineNo = 0; @@ -257,11 +260,18 @@ setfsent() else setfstab(getenv("PATH_FSTAB")); } - if ((_fs_fp = fopen(path_fstab, "r")) != NULL) { + fd = _open(path_fstab, O_RDONLY | O_CLOEXEC); + if (fd == -1) { + error(errno); + return (0); + } + _fs_fp = fdopen(fd, "r"); + if (_fs_fp != NULL) { LineNo = 0; return(1); } error(errno); + _close(fd); return(0); } |
