[mono] Remove verifier (#48142)

* remove DISABLE_VERIFIER

* Remove metadata-verify and calls to verifier-disabled functions

* Chase down callers of mini_method_verify and remove

Author: lambdageek

src/mono/CMakeLists.txt

@@ -79,7 +79,6 @@ set(DISABLE_MDB 1)
 set(DISABLE_COM 1)
 set(DISABLE_PERFCOUNTERS 1)
 set(DISABLE_ATTACH 1)
-set(DISABLE_VERIFIER 1)
 
 # Dependencies between options
 if(ENABLE_INTERP_LIB)

src/mono/cmake/options.cmake

@@ -15,7 +15,6 @@ option (DISABLE_COM "Disable COM support")
 option (DISABLE_SSA "Disable advanced SSA JIT optimizations")
 option (DISABLE_GENERICS "Disable generics support")
 option (DISABLE_ATTACH "Disable agent attach support")
-option (DISABLE_VERIFIER "Disables the verifier")
 option (DISABLE_JIT "Disable the JIT, only full-aot mode or interpreter will be supported by the runtime.")
 option (DISABLE_INTERPRETER "Disable the interpreter.")
 option (DISABLE_SIMD "Disable SIMD intrinsics related optimizations.")

src/mono/mono/metadata/CMakeLists.txt

@@ -117,7 +117,6 @@ set(metadata_common_sources
     mempool.h
     mempool-internals.h
     metadata.c
-    metadata-verify.c
     metadata-internals.h
     metadata-update.h
     metadata-update.c
@@ -168,7 +167,6 @@ set(metadata_common_sources
     threads.c
     threads-types.h
     verify.c
-    verify-internals.h
     wrapper-types.h
     dynamic-image-internals.h
     dynamic-stream.c

src/mono/mono/metadata/class-init.c

@@ -2767,11 +2767,6 @@ mono_class_init_internal (MonoClass *klass)
 	 * information and write it to @klass inside a lock.
 	 */
 
-	if (mono_verifier_is_enabled_for_class (klass) && !mono_verifier_verify_class (klass)) {
-		mono_class_set_type_load_failure (klass, "%s", concat_two_strings_with_zero (klass->image, klass->name, klass->image->assembly_name));
-		goto leave;
-	}
-
 	MonoType *klass_byval_arg;
 	klass_byval_arg = m_class_get_byval_arg (klass);
 	if (klass_byval_arg->type == MONO_TYPE_ARRAY || klass_byval_arg->type == MONO_TYPE_SZARRAY) {

src/mono/mono/metadata/class.c

@@ -40,7 +40,6 @@
 #include <mono/metadata/security-core-clr.h>
 #include <mono/metadata/attrdefs.h>
 #include <mono/metadata/gc-internals.h>
-#include <mono/metadata/verify-internals.h>
 #include <mono/metadata/mono-debug.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/mono-string.h>
@@ -128,9 +127,6 @@ mono_class_from_typeref_checked (MonoImage *image, guint32 type_token, MonoError
 
 	error_init (error);
 
-	if (!mono_verifier_verify_typeref_row (image, (type_token & 0xffffff) - 1, error))
-		return NULL;
-
 	mono_metadata_decode_row (t, (type_token&0xffffff)-1, cols, MONO_TYPEREF_SIZE);
 
 	name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
@@ -1551,9 +1547,6 @@ mono_class_find_enum_basetype (MonoClass *klass, MonoError *error)
 		if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_STATIC) //no need to decode static fields
 			continue;
 
-		if (!mono_verifier_verify_field_signature (image, cols [MONO_FIELD_SIGNATURE], error))
-			goto fail;
-
 		sig = mono_metadata_blob_heap (image, cols [MONO_FIELD_SIGNATURE]);
 		mono_metadata_decode_value (sig, &sig);
 		/* FIELD signature == 0x06 */
@@ -2711,20 +2704,13 @@ mono_class_name_from_token (MonoImage *image, guint32 type_token)
 	}
 
 	case MONO_TOKEN_TYPE_REF: {
-		ERROR_DECL (error);
 		guint32 cols [MONO_TYPEREF_SIZE];
 		MonoTableInfo  *t = &image->tables [MONO_TABLE_TYPEREF];
 		guint tidx = mono_metadata_token_index (type_token);
 
 		if (tidx > t->rows)
 			return g_strdup_printf ("Invalid type token 0x%08x", type_token);
 
-		if (!mono_verifier_verify_typeref_row (image, tidx - 1, error)) {
-			char *msg = g_strdup_printf ("Invalid type token 0x%08x due to '%s'", type_token, mono_error_get_message (error));
-			mono_error_cleanup (error);
-			return msg;
-		}
-
 		mono_metadata_decode_row (t, tidx-1, cols, MONO_TYPEREF_SIZE);
 		name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
 		nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
@@ -2755,7 +2741,6 @@ mono_assembly_name_from_token (MonoImage *image, guint32 type_token)
 			return g_strdup (image->assembly_name);
 		return g_strdup_printf ("%s", image->name ? image->name : "[Could not resolve assembly name");
 	case MONO_TOKEN_TYPE_REF: {
-		ERROR_DECL (error);
 		MonoAssemblyName aname;
 		memset (&aname, 0, sizeof (MonoAssemblyName));
 		guint32 cols [MONO_TYPEREF_SIZE];
@@ -2765,11 +2750,6 @@ mono_assembly_name_from_token (MonoImage *image, guint32 type_token)
 		if (idx > t->rows)
 			return g_strdup_printf ("Invalid type token 0x%08x", type_token);
 
-		if (!mono_verifier_verify_typeref_row (image, idx - 1, error)) {
-			char *msg = g_strdup_printf ("Invalid type token 0x%08x due to '%s'", type_token, mono_error_get_message (error));
-			mono_error_cleanup (error);
-			return msg;
-		}
 		mono_metadata_decode_row (t, idx-1, cols, MONO_TYPEREF_SIZE);
 
 		idx = cols [MONO_TYPEREF_SCOPE] >> MONO_RESOLUTION_SCOPE_BITS;
@@ -6378,11 +6358,6 @@ mono_field_resolve_type (MonoClassField *field, MonoError *error)
 		/* first_field_idx and idx points into the fieldptr table */
 		mono_metadata_decode_table_row (image, MONO_TABLE_FIELD, idx, cols, MONO_FIELD_SIZE);
 
-		if (!mono_verifier_verify_field_signature (image, cols [MONO_FIELD_SIGNATURE], error)) {
-			mono_class_set_type_load_failure (klass, "%s", mono_error_get_message (error));
-			return;
-		}
-
 		sig = mono_metadata_blob_heap (image, cols [MONO_FIELD_SIGNATURE]);
 
 		mono_metadata_decode_value (sig, &sig);

src/mono/mono/metadata/custom-attrs.c

@@ -24,7 +24,6 @@
 #include "mono/metadata/reflection-internals.h"
 #include "mono/metadata/tabledefs.h"
 #include "mono/metadata/tokentype.h"
-#include "mono/metadata/verify-internals.h"
 #include "mono/metadata/icall-decl.h"
 #include "mono/utils/checked-build.h"
 
@@ -875,9 +874,6 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu
 
 	mono_class_init_internal (method->klass);
 
-	if (!mono_verifier_verify_cattr_content (image, method, data, len, error))
-		goto fail;
-
 	if (len == 0) {
 		attr = mono_object_new_handle (mono_domain_get (), method->klass, error);
 		goto_if_nok (error, fail);
@@ -1069,9 +1065,6 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
 
 	error_init (error);
 
-	if (!mono_verifier_verify_cattr_content (image, method, data, len, error))
-		return;
-
 	mono_class_init_internal (method->klass);
 
 	domain = mono_domain_get ();
@@ -1235,9 +1228,6 @@ mono_reflection_create_custom_attr_data_args_noalloc (MonoImage *image, MonoMeth
 
 	error_init (error);
 
-	if (!mono_verifier_verify_cattr_content (image, method, data, len, error))
-		goto fail;
-
 	mono_class_init_internal (method->klass);
 
 	if (len < 2 || read16 (p) != 0x0001) /* Prolog */
@@ -1688,11 +1678,6 @@ mono_custom_attrs_from_index_checked (MonoImage *image, guint32 idx, gboolean ig
 			}
 		}
 
-		if (!mono_verifier_verify_cattr_blob (image, cols [MONO_CUSTOM_ATTR_VALUE], error)) {
-			g_array_free (attr_array, TRUE);
-			g_free (ainfo);
-			return NULL;
-		}
 		data = mono_metadata_blob_heap (image, cols [MONO_CUSTOM_ATTR_VALUE]);
 		attr->data_size = mono_metadata_decode_value (data, &data);
 		attr->data = (guchar*)data;

src/mono/mono/metadata/image.c

@@ -42,7 +42,6 @@
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/object-internals.h>
 #include <mono/metadata/security-core-clr.h>
-#include <mono/metadata/verify-internals.h>
 #include <mono/metadata/verify.h>
 #include <mono/metadata/image-internals.h>
 #include <mono/metadata/loaded-images-internals.h>
@@ -1233,9 +1232,6 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
 		if (care_about_pecoff == FALSE)
 			goto done;
 
-		if (image->loader == &pe_loader && !mono_verifier_verify_pe_data (image, error))
-			goto invalid_image;
-
 		if (!mono_image_load_pe_data (image))
 			goto invalid_image;
 	} else {
@@ -1246,15 +1242,9 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
 		goto done;
 	}
 
-	if (image->loader == &pe_loader && !image->metadata_only && !mono_verifier_verify_cli_data (image, error))
-		goto invalid_image;
-
 	if (!mono_image_load_cli_data (image))
 		goto invalid_image;
 
-	if (image->loader == &pe_loader && !image->metadata_only && !mono_verifier_verify_table_data (image, error))
-		goto invalid_image;
-
 #ifdef ENABLE_METADATA_UPDATE
 	dump_encmap (image);
 #endif

src/mono/mono/metadata/loader.c

@@ -42,7 +42,6 @@
 #include <mono/metadata/exception.h>
 #include <mono/metadata/marshal.h>
 #include <mono/metadata/lock-tracer.h>
-#include <mono/metadata/verify-internals.h>
 #include <mono/metadata/exception-internals.h>
 #include <mono/utils/mono-logger-internals.h>
 #include <mono/utils/mono-dl.h>
@@ -274,9 +273,6 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
 
 	fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
-	if (!mono_verifier_verify_memberref_field_signature (image, cols [MONO_MEMBERREF_SIGNATURE], error))
-		return NULL;
-
 	switch (class_index) {
 	case MONO_MEMBERREF_PARENT_TYPEDEF:
 		klass = mono_class_get_checked (image, MONO_TOKEN_TYPE_DEF | nindex, error);
@@ -775,9 +771,6 @@ mono_method_get_signature_checked (MonoMethod *method, MonoImage *image, guint32
 
 		sig = (MonoMethodSignature *)find_cached_memberref_sig (image, sig_idx);
 		if (!sig) {
-			if (!mono_verifier_verify_memberref_method_signature (image, sig_idx, error))
-				return NULL;
-
 			ptr = mono_metadata_blob_heap (image, sig_idx);
 			mono_metadata_decode_blob_size (ptr, &ptr);
 
@@ -787,14 +780,6 @@ mono_method_get_signature_checked (MonoMethod *method, MonoImage *image, guint32
 
 			sig = (MonoMethodSignature *)cache_memberref_sig (image, sig_idx, sig);
 		}
-		/* FIXME: we probably should verify signature compat in the dynamic case too*/
-		if (!mono_verifier_is_sig_compatible (image, method, sig)) {
-			guint32 klass = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
-			const char *fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
-
-			mono_error_set_bad_image (error, image, "Incompatible method signature class token 0x%08x field name %s token 0x%08x", klass, fname, token);
-			return NULL;
-		}
 	}
 
 	if (context) {
@@ -916,9 +901,6 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
 
 	sig_idx = cols [MONO_MEMBERREF_SIGNATURE];
 
-	if (!mono_verifier_verify_memberref_method_signature (image, sig_idx, error))
-		goto fail;
-
 	ptr = mono_metadata_blob_heap (image, sig_idx);
 	mono_metadata_decode_blob_size (ptr, &ptr);
 
@@ -985,9 +967,6 @@ method_from_methodspec (MonoImage *image, MonoGenericContext *context, guint32 i
 	token = cols [MONO_METHODSPEC_METHOD];
 	nindex = token >> MONO_METHODDEFORREF_BITS;
 
-	if (!mono_verifier_verify_methodspec_signature (image, cols [MONO_METHODSPEC_SIGNATURE], error))
-		return NULL;
-
 	ptr = mono_metadata_blob_heap (image, cols [MONO_METHODSPEC_SIGNATURE]);
 
 	mono_metadata_decode_value (ptr, &ptr);
@@ -1862,9 +1841,6 @@ mono_method_signature_checked_slow (MonoMethod *m, MonoError *error)
 
 	if (!signature) {
 		const char *sig_body;
-		/*TODO we should cache the failure result somewhere*/
-		if (!mono_verifier_verify_method_signature (img, sig_offset, error))
-			return NULL;
 
 		/* size = */ mono_metadata_decode_blob_size (sig, &sig_body);
 
@@ -2106,9 +2082,6 @@ mono_method_get_header_internal (MonoMethod *method, MonoError *error)
 	if (!loc) {
 		rva = mono_metadata_decode_row_col (&img->tables [MONO_TABLE_METHOD], idx - 1, MONO_METHOD_RVA);
 
-		if (!mono_verifier_verify_method_header (img, rva, error))
-			return NULL;
-
 		loc = mono_image_rva_map (img, rva);
 	}