aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-hardened/zfs-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/linux-hardened/zfs-fix.patch')
-rw-r--r--main/linux-hardened/zfs-fix.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/main/linux-hardened/zfs-fix.patch b/main/linux-hardened/zfs-fix.patch
new file mode 100644
index 0000000000..997add4dbc
--- /dev/null
+++ b/main/linux-hardened/zfs-fix.patch
@@ -0,0 +1,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;
+ }