diff options
| -rw-r--r-- | libjava/ChangeLog | 16 | ||||
| -rwxr-xr-x | libjava/configure | 6 | ||||
| -rw-r--r-- | libjava/configure.ac | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 2 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 6 | ||||
| -rw-r--r-- | libjava/include/posix.h | 9 | ||||
| -rw-r--r-- | libjava/java/lang/natPosixProcess.cc | 37 |
9 files changed, 56 insertions, 30 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 03ac64e880e..281fb22fd38 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,19 @@ +2007-03-22 David Daney <ddaney@avtrex.com> + + PR libgcj/31228 + * configure.ac: Add checks for getrlimit and sys/resource.h. + * include/posix.h (_Jv_platform_close_on_exec): Remove. + * include/config.h.in: Regenerate. + * configure: Regenerate. + * gnu/java/nio/channels/natFileChannelPosix.cc (open): Remove call to + _Jv_platform_close_on_exec; + * gnu/java/net/natPlainSocketImplPosix.cc (create): Likewise. + (accept): Likewise. + * gnu/java/net/natPlainDatagramSocketImplPosix.cc (create):Likewise. + * java/lang/natPosixProcess.cc: Include sys/resource.h. + (nativeSpawn): Close all file descriptors. Don't set FD_CLOEXEC on + pipes. + 2007-03-20 Andrew Haley <aph@redhat.com> * testsuite/libjava.lang/PR31264.java: New test. diff --git a/libjava/configure b/libjava/configure index 8a81965a5ec..79806d34c76 100755 --- a/libjava/configure +++ b/libjava/configure @@ -9602,12 +9602,13 @@ else + for ac_func in strerror ioctl select fstat open fsync sleep opendir \ gmtime_r localtime_r readdir_r getpwuid_r getcwd \ access stat lstat mkdir rename rmdir unlink utime chmod readlink \ nl_langinfo setlocale \ inet_pton uname inet_ntoa \ - fork execvp pipe sigaction ftruncate mmap \ + fork execvp getrlimit pipe sigaction ftruncate mmap \ getifaddrs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -10063,7 +10064,8 @@ done -for ac_header in execinfo.h unistd.h dlfcn.h + +for ac_header in execinfo.h unistd.h dlfcn.h sys/resource.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/libjava/configure.ac b/libjava/configure.ac index d21654ae00b..f5e27fab313 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1006,10 +1006,10 @@ else access stat lstat mkdir rename rmdir unlink utime chmod readlink \ nl_langinfo setlocale \ inet_pton uname inet_ntoa \ - fork execvp pipe sigaction ftruncate mmap \ + fork execvp getrlimit pipe sigaction ftruncate mmap \ getifaddrs]) AC_CHECK_FUNCS(inet_aton inet_addr, break) - AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h) + AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h sys/resource.h) # Do an additional check on dld, HP-UX for example has dladdr in libdld.sl AC_CHECK_LIB(dl, dladdr, [ AC_DEFINE(HAVE_DLADDR, 1, [Define if you have dladdr()])], [ diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index f7ffaa895c3..7cbf011ab50 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc @@ -83,8 +83,6 @@ gnu::java::net::PlainDatagramSocketImpl::create () throw new ::java::net::SocketException (JvNewStringUTF (strerr)); } - _Jv_platform_close_on_exec (sock); - // We use native_fd in place of fd here. From leaving fd null we avoid // the double close problem in FileDescriptor.finalize. native_fd = sock; diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 9fc619649d3..d16f1d31f7b 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -72,8 +72,6 @@ gnu::java::net::PlainSocketImpl::create (jboolean stream) throw new ::java::io::IOException (JvNewStringUTF (strerr)); } - _Jv_platform_close_on_exec (sock); - // We use native_fd in place of fd here. From leaving fd null we avoid // the double close problem in FileDescriptor.finalize. native_fd = sock; @@ -285,8 +283,6 @@ gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s) if (new_socket < 0) goto error; - _Jv_platform_close_on_exec (new_socket); - jbyteArray raddr; jint rport; if (u.address.sin_family == AF_INET) diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc index 4851403a8db..52caf828345 100644 --- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc +++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc @@ -178,8 +178,6 @@ FileChannelImpl::open (jstring path, jint jflags) throw new ::java::io::FileNotFoundException (msg->toString ()); } - _Jv_platform_close_on_exec (fd); - return fd; } diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 2c025a27af5..f0919e2673c 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -127,6 +127,9 @@ /* Define to 1 if you have the `getpwuid_r' function. */ #undef HAVE_GETPWUID_R +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -316,6 +319,9 @@ /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H +/* Define to 1 if you have the <sys/resource.h> header file. */ +#undef HAVE_SYS_RESOURCE_H + /* Define to 1 if you have the <sys/rw_lock.h> header file. */ #undef HAVE_SYS_RW_LOCK_H diff --git a/libjava/include/posix.h b/libjava/include/posix.h index ee836e0b809..5f522a3804a 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -98,15 +98,6 @@ extern jlong _Jv_platform_nanotime (); extern void _Jv_platform_initialize (void); extern void _Jv_platform_initProperties (java::util::Properties*); -inline void -_Jv_platform_close_on_exec (jint fd) -{ - // Ignore errors. - ::fcntl (fd, F_SETFD, FD_CLOEXEC); -} - -#undef fcntl - #ifdef JV_HASH_SYNCHRONIZATION #ifndef HAVE_USLEEP_DECL extern "C" int usleep (useconds_t useconds); diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc index 149b5d8ba34..6763273546c 100644 --- a/libjava/java/lang/natPosixProcess.cc +++ b/libjava/java/lang/natPosixProcess.cc @@ -17,6 +17,9 @@ details. */ #include <fcntl.h> #include <sys/types.h> #include <sys/wait.h> +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include <signal.h> #include <string.h> #include <stdlib.h> @@ -352,7 +355,31 @@ java::lang::PosixProcess::nativeSpawn () _exit (127); } } - + // Make sure all file descriptors are closed. In + // multi-threaded programs, there is a race between when a + // descriptor is obtained, when we can set FD_CLOEXEC, and + // fork(). If the fork occurs before FD_CLOEXEC is set, the + // descriptor would leak to the execed process if we did not + // manually close it. So that is what we do. Since we + // close all the descriptors, it is redundant to set + // FD_CLOEXEC on them elsewhere. + int max_fd; +#ifdef HAVE_GETRLIMIT + rlimit rl; + int rv = getrlimit(RLIMIT_NOFILE, &rl); + if (rv == 0) + max_fd = rl.rlim_max - 1; + else + max_fd = 1024 - 1; +#else + max_fd = 1024 - 1; +#endif + while(max_fd > 2) + { + if (max_fd != msgp[1]) + close (max_fd); + max_fd--; + } // Make sure that SIGCHLD is unblocked for the new process. sigset_t mask; sigemptyset (&mask); @@ -438,12 +465,4 @@ java::lang::PosixProcess::nativeSpawn () myclose (msgp[0]); cleanup (args, env, path); - - if (exception == NULL) - { - fcntl (outp[1], F_SETFD, FD_CLOEXEC); - fcntl (inp[0], F_SETFD, FD_CLOEXEC); - if (! redirect) - fcntl (errp[0], F_SETFD, FD_CLOEXEC); - } } |
