Revert "module.c: allow stock modules to load"

This reverts commit 2846ca2.
engstk · Oct 26, 2020 · f4f3b09 · f4f3b09
1 parent 98dadf5
commit f4f3b09
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/kernel/module.c b/kernel/module.c
@@ -1324,7 +1324,7 @@ static int check_version(const struct load_info *info,
 bad_version:
 	pr_warn("%s: disagrees about version of symbol %s\n",
 	       info->name, symname);
-	return 1;
+	return 0;
 }
 
 static inline int check_modstruct_version(const struct load_info *info,
@@ -3040,15 +3040,15 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
 		modmagic = NULL;
 
 	/* This is allowed: modprobe --force will invalidate it. */
-	/*if (!modmagic) {
+	if (!modmagic) {
 		err = try_to_force_load(mod, "bad vermagic");
 		if (err)
 			return err;
 	} else if (!same_magic(modmagic, vermagic, info->index.vers)) {
 		pr_err("%s: version magic '%s' should be '%s'\n",
 		       info->name, modmagic, vermagic);
 		return -ENOEXEC;
-	}*/
+	}
 
 	if (!get_modinfo(info, "intree")) {
 		if (!test_taint(TAINT_OOT_MODULE))