hg: jdk7/tl/jdk: 7000511: PrintStream, PrintWriter, Formatter, Scanner leave files open when exception thrown

2011-01-07 Thread chris . hegarty
Changeset: b8663921f5d7
Author:chegar
Date:  2011-01-07 13:08 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b8663921f5d7

7000511: PrintStream, PrintWriter, Formatter, Scanner leave files open when 
exception thrown
Reviewed-by: alanb, mduigou

! src/share/classes/java/io/PrintStream.java
! src/share/classes/java/io/PrintWriter.java
! src/share/classes/java/util/Formatter.java
! src/share/classes/java/util/Scanner.java
! test/ProblemList.txt
+ test/java/io/PrintStream/FailingConstructors.java
+ test/java/io/PrintWriter/FailingConstructors.java
! test/java/util/Formatter/Constructors.java
+ test/java/util/Formatter/FailingConstructors.java
+ test/java/util/Scanner/FailingConstructors.java



hg: jdk7/tl/jdk: 2 new changesets

2011-01-07 Thread alan . bateman
Changeset: 5124c2a50539
Author:alanb
Date:  2011-01-07 15:49 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5124c2a50539

6993732: Remove the HPI
Reviewed-by: ohair, lancea, chegar, mduigou, mchung, mr

! make/common/Defs-linux.gmk
! make/common/Defs-solaris.gmk
! make/common/Defs-windows.gmk
! make/common/Defs.gmk
! make/common/Modules.gmk
! make/common/Release.gmk
! make/java/Makefile
! make/java/fdlibm/Makefile
- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
! make/tools/reorder/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c

Changeset: ddaffd64796c
Author:alanb
Date:  2011-01-07 15:51 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ddaffd64796c

Merge




Code Review 7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption()

2011-01-07 Thread Chris Hegarty

Alan,

In socketGetOption() function if the option is 
java_net_SocketOptions_SO_BINDADDR the code allocates a SOCKET_ADDRESS, 
him, structure on the stack. This structure is 8 bytes long. 'len' is 
then set to sizeof(struct sockaddr_in) which is 16. If it's an IPV6 
socket the len could get set to sizeof(struct SOCKADDR_IN6) which is 28 
bytes. getsockname() is called with a pointer to 'him' and len set as 
above. This could overwrite data on the C stack.


You want to use is SOCKETADDRESS instead since that is a union of 
sockaddr, sockaddr_in and SOCKADDR_IN6 so it is properly sized.


http://cr.openjdk.java.net/~chegar/7009760/webrev.00/webrev/

-Chris.


Re: Code Review 7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption()

2011-01-07 Thread Alan Bateman

Chris Hegarty wrote:

Alan,

In socketGetOption() function if the option is 
java_net_SocketOptions_SO_BINDADDR the code allocates a 
SOCKET_ADDRESS, him, structure on the stack. This structure is 8 bytes 
long. 'len' is then set to sizeof(struct sockaddr_in) which is 16. If 
it's an IPV6 socket the len could get set to sizeof(struct 
SOCKADDR_IN6) which is 28 bytes. getsockname() is called with a 
pointer to 'him' and len set as above. This could overwrite data on 
the C stack.


You want to use is SOCKETADDRESS instead since that is a union of 
sockaddr, sockaddr_in and SOCKADDR_IN6 so it is properly sized.


http://cr.openjdk.java.net/~chegar/7009760/webrev.00/webrev/

-Chris.

Looks okay to me.

-Alan.


hg: jdk7/tl/jdk: 7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption

2011-01-07 Thread chris . hegarty
Changeset: 6bf1c5958c22
Author:chegar
Date:  2011-01-07 21:02 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6bf1c5958c22

7009760: Possible stack corruption in 
Java_java_net_TwoStacksPlainSocketImpl_socketGetOption
Summary: SOCKET_ADDRESS -> SOCKETADDRESS
Reviewed-by: alanb

! src/windows/native/java/net/TwoStacksPlainSocketImpl.c



hg: jdk7/tl/jdk: 7008728: diamond conversion of basic security, permissions, authentication

2011-01-07 Thread stuart . marks
Changeset: 3dbc783a8073
Author:smarks
Date:  2011-01-07 15:39 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3dbc783a8073

7008728: diamond conversion of basic security, permissions, authentication
Reviewed-by: mullan

! src/share/classes/com/sun/security/auth/PolicyFile.java
! src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
! src/share/classes/com/sun/security/auth/login/ConfigFile.java
! src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
! src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
! src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
! src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
! src/share/classes/java/security/AccessControlContext.java
! src/share/classes/java/security/BasicPermission.java
! src/share/classes/java/security/CodeSource.java
! src/share/classes/java/security/Permissions.java
! src/share/classes/java/security/ProtectionDomain.java
! src/share/classes/java/security/Provider.java
! src/share/classes/java/security/SecureClassLoader.java
! src/share/classes/java/security/Security.java
! src/share/classes/java/security/UnresolvedPermission.java
! src/share/classes/java/security/UnresolvedPermissionCollection.java
! src/share/classes/javax/security/auth/PrivateCredentialPermission.java
! src/share/classes/javax/security/auth/SubjectDomainCombiner.java
! src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
! src/share/classes/javax/security/auth/kerberos/ServicePermission.java
! src/share/classes/sun/security/acl/AclEntryImpl.java
! src/share/classes/sun/security/acl/AclImpl.java
! src/share/classes/sun/security/acl/GroupImpl.java
! test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java
! test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java