From ffafe01a8749fcce80b960cd3a2ea73764dc6cc4 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <ahughes@redhat.com>
Date: Thu, 16 Dec 2010 19:48:07 +0000
Subject: [PATCH] PR libgcj/46774: Create dynamic ProtectionDomain instances
 which check the system policy.

2010-12-13  Andrew John Hughes  <ahughes@redhat.com>

	PR libgcj/46774
	* libjava/java/security/VMAccessController.java:
	(DEFAULT_CONTEXT): Create ProtectionDomain with
	four argument constructor (arguments are the same
	as those implied by the two argument constructor).
	(getContext()): Create ProtectionDomain instances
	with four argument constructor using a null Principal
	array (as before) but including the classloader, which
	was always null before.

From-SVN: r167952
---
 libjava/ChangeLog                             |  12 ++++++++++++
 .../java/security/VMAccessController.class    | Bin 4797 -> 4908 bytes
 libjava/java/security/VMAccessController.java |  16 +++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 16cfc79099c..c53120d3086 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-13  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR libgcj/46774
+	* libjava/java/security/VMAccessController.java:
+	(DEFAULT_CONTEXT): Create ProtectionDomain with
+	four argument constructor (arguments are the same
+	as those implied by the two argument constructor).
+	(getContext()): Create ProtectionDomain instances
+	with four argument constructor using a null Principal
+	array (as before) but including the classloader, which
+	was always null before.
+
 2010-12-06  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	PR target/40125
diff --git a/libjava/classpath/lib/java/security/VMAccessController.class b/libjava/classpath/lib/java/security/VMAccessController.class
index d05cd9c84563057d1913a73bbf76e0f79f1b626d..9a129803916b867882348cf74e336fe473881338 100644
GIT binary patch
delta 756
zcmZ{iUrfzm7{@=)sm}SGU!`QR!>lutNwrQT?9hhB1va`!(ySe)R;SKRsiwK9*>Y#m
zelFxj5&6@M%84RvSQ9c6t0AF3{)A-a4)3Wuo4tGA=l`?s_j%siv8^lg{@-0aKr%De
z^ebX2UupE378`@IeBq8_*Fjg3*X1ir%J8}>Dt45*@(aohSLgzZ$LIExxxDSaB-0$D
z)5sYMO+v&!6=9sE**KyluF*IzSlvYh?h=o$(5`Voncmrk_H?^WF_*%)OtqjD7F2Ha
zlvh-$w(b4eaFE?RmnSUx52D7f7HcC`f)tO<#;))<lZbIBd|hG^P8_7Oo{el`6-g?=
zuF`Zx*P$*%5l0HC2#)rV@IldoBC!w(a>BS3QI^`A5N%0uYBtT!X{WV~#0KKK$;yd3
z*GW#mo9id<2JTs3OTcF}awC`I>Ned^)hWUQ@?tN`oaR7wt5XH~Ft?Cm3kig-HUx~=
zIin-n7TnF!oIt=Ic)Dy>=_JNaM|Q16qAdwMO@DHYfymmR7o-_k^S9Srr<zV`xyebo
zX{ASLce%qo`nb<i9x%j1Uh{}i9`lI-zVL*fJQEm{5S~k@(j#aS8$%Mqu%z-zGI%Ll
z7?Ev^N+x5nn{nC8gzRHd@|7%9b}3VGxQ1yt%8b<WV|KW8%p+KiQ^o-`+<5U&&WIXr
zitOhN^_bWodlVE+Eg?_Rc*{G2DUt-<D=mZ)iDL}2IzIIq#+gvds8ZA>`Jig5Rfms?
sgjErY;xiQ_>x$o6Rx^dJ5bsp%(y%DZ4!-gYO?2uwrl1JZ>NWBGFD@_2zW@LL

delta 678
zcmX|<TS$~q6otP%*MEj4a!7D0aWJ*K%xG#*gO(BWP!ASSA`+H5s3~SD2tf^jJrq>L
z|B^waWoac*YNI$PQ9)s4U{V-j<)w?2=~E9yb^eOjaL!(9oxRUGm(HYtMCZ`Y{y|_3
z^S7Nh#k6U)zF=CWk4i#!vT3_5Nuxz@lvV^wt14^Cy&9JktUj=>ELi8w^*U+es+}wP
zQEjQYoeur1=8JK%pX-ab!4W|#4>oM6tgCNOE4#mIV`i&V3tm0e;ni2TLXHdAF{|zK
z^fp(r{>-(`=OcihT-KAvMp8&us#mRXsw_j<1UIY5Bn!dcoxONeoThJBm5!X$-Aigi
z=hLF?nE|Z}Uo-v)y9(VGdnxp2VT!^O_fh(XYyHPv{!hm?lMroB8?=_SuskJ9FyQbw
z!Ze=4Wz5&^5+AS`Z8{C%A+~nXJyt`y)og(HzhGrgfyWXdw$M<*#?aqOT$rAMCc7B@
zTYr`4sZmYlVY2kDsBNJzhw0-C{d6$E9qtj~zKRDt<q@L{F~(!YdBQuzd}NpfM)<*V
zu`nVUUE=12#PCwmcqKWE$p*${GZV6vNy%qQb}}uynUOte-m7p0vvP<zImW!42&s0)
zB{$*1BFCxaphBrqLLC$8k~5`<*UFxW9NEDeH1!z8;^!@sSg4Rhrc`F7O5&NurlLmu
ziWz0rPNS-O&j(c#QP1{~dK~IN*(zpnD4Y3wB5o~q<urrOd_fZ@r#P()2y<#Q@%1+w
Cg0Hgx

diff --git a/libjava/java/security/VMAccessController.java b/libjava/java/security/VMAccessController.java
index 8436c9ccb60..d214e1926d0 100644
--- a/libjava/java/security/VMAccessController.java
+++ b/libjava/java/security/VMAccessController.java
@@ -56,7 +56,7 @@ final class VMAccessController
     Permissions permissions = new Permissions();
     permissions.add(new AllPermission());
     ProtectionDomain[] domain = new ProtectionDomain[] {
-      new ProtectionDomain(source, permissions)
+      new ProtectionDomain(source, permissions, null, null)
     };
     DEFAULT_CONTEXT = new AccessControlContext(domain);
   }
@@ -121,7 +121,7 @@ final class VMAccessController
     LinkedList stack = state.getContexts();
     if (!stack.isEmpty())
       {
-	stack.removeFirst();
+        stack.removeFirst();
       }
     else if (DEBUG)
       {
@@ -178,26 +178,27 @@ final class VMAccessController
     for (int i = 3; i < classes.length; i++)
       {
         Class clazz = classes[i];
+        ClassLoader loader = clazz.getClassLoader();
 
         if (DEBUG)
           {
             debug("checking " + clazz);
             // subject to getClassLoader RuntimePermission
-            debug("loader = " + clazz.getClassLoader());
+            debug("loader = " + loader);
           }
 
         if (privileged && i == classes.length - 2)
           {
             // If there was a call to doPrivileged with a supplied context,
-            // return that context. If using JAAS doAs*, it should be 
-	    // a context with a SubjectDomainCombiner
+            // return that context. If using JAAS doAs*, it should be
+            // a context with a SubjectDomainCombiner
             LinkedList l = state.getContexts();
             if (!l.isEmpty())
               context = (AccessControlContext) l.getFirst();
           }
 
         // subject to getProtectionDomain RuntimePermission
-	ProtectionDomain domain = clazz.getProtectionDomain();
+        ProtectionDomain domain = clazz.getProtectionDomain();
 
         if (domain == null)
           continue;
@@ -208,7 +209,8 @@ final class VMAccessController
         // Create a static snapshot of this domain, which may change over time
         // if the current policy changes.
         domains.add(new ProtectionDomain(domain.getCodeSource(),
-                                         domain.getPermissions()));
+                                         domain.getPermissions(),
+                                         loader, null));
       }
 
     if (DEBUG)
-- 
2.30.2