diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-04-27 04:43:43 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-04-27 05:46:22 +0000 |
| commit | a6d113be9d34e5e0a6f83fc07d98b4d225e2d5dc (patch) | |
| tree | b3e46e51381e2e5c183c4172d7da58a67829a30d /main/linux-hardened/zfs-fix.patch | |
| parent | 83f5f5ff71d825935df80db5082daa03941f72ca (diff) | |
| download | aports-a6d113be9d34e5e0a6f83fc07d98b4d225e2d5dc.tar.bz2 aports-a6d113be9d34e5e0a6f83fc07d98b4d225e2d5dc.tar.xz | |
main/linux-grsec: rename to linux-hardened (no functional change, just to allow us to orphan linux-grsec)
Diffstat (limited to 'main/linux-hardened/zfs-fix.patch')
| -rw-r--r-- | main/linux-hardened/zfs-fix.patch | 13 |
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; + } |