aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/zfs-fix.patch
blob: 997add4dbcda36b44931983a9b429521fd8614a5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/kernel/module.c b/kernel/module.c
index f9d983b..aadd2ed 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3036,7 +3036,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
 	int err;
 
 #if defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR) || defined(CONFIG_PAX_RAP)
-	if (!license || !license_is_gpl_compatible(license)) {
+	if (!license || (!license_is_gpl_compatible(license) && strcmp(license, "CDDL") != 0)) {
 		pr_err("%s: module is not compatible with the KERNEXEC 'or' method and RAP\n", mod->name);
 		return -ENOEXEC;
 	}