X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fdeclsec.c;h=2ce31fb2fa3c2b656fade7089f2268e3e7a79b0b;hb=84e03c7279614ad807a37f863bee0c5b2b3ab37d;hp=a15418b205878a4ce0ac44a5683dac3a995f5a1e;hpb=6cc669610397bca45e16fee3d34bab1afb474395;p=mono.git

diff --git a/mono/mini/declsec.c b/mono/mini/declsec.c
index a15418b2058..2ce31fb2fa3 100644
--- a/mono/mini/declsec.c
+++ b/mono/mini/declsec.c
@@ -71,6 +71,7 @@ mono_declsec_create_frame (MonoDomain *domain, MonoJitInfo *jinfo)
 	}
 
 	frame->method = mono_method_get_object (domain, jinfo->method, NULL);
+	frame->domain = domain->domain;
 
 	/* stack modifiers on methods have priority on (i.e. replaces) modifiers on class */
 
@@ -174,7 +175,7 @@ mono_declsec_is_assembly_fulltrust (MonoDomain *domain, MonoAssembly *assembly)
  * @domain	The current application domain
  * @caller	The method calling
  * @callee	The called method
- * return value: TRUE if a security violation is detection, FALSE otherwise.
+ * return value: TRUE if a security violation is detected, FALSE otherwise.
  *
  * If callee's assembly is strongnamed and doesn't have an 
  * [AllowPartiallyTrustedCallers] attribute then we must enforce a LinkDemand
@@ -211,7 +212,7 @@ mono_declsec_linkdemand_aptc (MonoDomain *domain, MonoMethod *caller, MonoMethod
 		secman = mono_security_manager_get_methods ();
 		if (secman && cinfo) {
 			/* look for AllowPartiallyTrustedCallersAttribute */
-			result = mono_custom_attrs_has_attr (cinfo, secman->aptc);
+			result = mono_custom_attrs_has_attr (cinfo, secman->allowpartiallytrustedcallers);
 		}
 		MONO_SECMAN_FLAG_SET_VALUE (assembly->aptc, result);
 	}
@@ -220,6 +221,7 @@ mono_declsec_linkdemand_aptc (MonoDomain *domain, MonoMethod *caller, MonoMethod
 		return FALSE;
 
 	/* E - the caller's assembly must have full trust permissions */
+	assembly = mono_image_get_assembly (caller->klass->image);
 	if (mono_declsec_is_assembly_fulltrust (domain, assembly))
 		return FALSE;
 
@@ -235,7 +237,7 @@ mono_declsec_linkdemand_aptc (MonoDomain *domain, MonoMethod *caller, MonoMethod
  * @domain	The current application domain
  * @caller	The method calling
  * @native	The native method called
- * return value: TRUE if a security violation is detection, FALSE otherwise.
+ * return value: TRUE if a security violation is detected, FALSE otherwise.
  *
  * Executing Platform Invokes (P/Invoke) is a is a restricted operation.
  * The security policy must allow (SecurityPermissionFlag.UnmanagedCode)
@@ -266,6 +268,7 @@ mono_declsec_linkdemand_pinvoke (MonoDomain *domain, MonoMethod *caller, MonoMet
 		if (MONO_SECMAN_FLAG_INIT (assembly->fulltrust) && MONO_SECMAN_FLAG_GET_VALUE (assembly->fulltrust)) {
 			/* FullTrust includes UnmanagedCode permission */
 			MONO_SECMAN_FLAG_SET_VALUE (assembly->unmanaged, TRUE);
+			return FALSE;
 		} else {
 			MonoReflectionAssembly *refass = (MonoReflectionAssembly*) mono_assembly_get_object (domain, assembly);
 			MonoSecurityManager* secman = mono_security_manager_get_methods ();
@@ -300,7 +303,7 @@ mono_declsec_linkdemand_pinvoke (MonoDomain *domain, MonoMethod *caller, MonoMet
  * @domain	The current application domain
  * @caller	The method calling
  * @icall	The internal call method
- * return value: TRUE if a security violation is detection, FALSE otherwise.
+ * return value: TRUE if a security violation is detected, FALSE otherwise.
  *
  * We can't trust the icall flags/iflags as it comes from the assembly
  * that we may want to restrict and we do not have the public/restricted
@@ -356,7 +359,13 @@ guint32
 mono_declsec_linkdemand (MonoDomain *domain, MonoMethod *caller, MonoMethod *callee)
 {
 	guint32 violation = MONO_JIT_SECURITY_OK;
-	/* first, the special (implied) linkdemand */
+
+	/* short-circuit corlib as it is fully trusted (within itself)
+	 * and because this cause major recursion headaches */
+	if ((caller->klass->image == mono_defaults.corlib) && (callee->klass->image == mono_defaults.corlib))
+		return violation;
+
+	/* next, the special (implied) linkdemand */
 
 	if (callee->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
 		/* restrict internal calls into the runtime */