Author: kib
Date: Thu Jun 14 12:28:43 2012
New Revision: 237061
URL: http://svn.freebsd.org/changeset/base/237061
Log:
Make sure that fstab fd is not leaked on exec.
PR: kern/169023
Submitted by: Jukka Ukkonen <jau iki fi>
MFC after: 1 week
Modified:
head/lib/libc/gen/fstab.c
Modified: head/lib/libc/gen/fstab.c
==============================================================================
--- head/lib/libc/gen/fstab.c Thu Jun 14 11:39:43 2012 (r237060)
+++ head/lib/libc/gen/fstab.c Thu Jun 14 12:28:43 2012 (r237061)
@@ -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);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
