RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2024-12-27 07:42:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

kmod/core: fix module taint for 4.9 kernel

Browse Source 
Upstream 2992ef29ae01 "livepatch/module: make TAINT_LIVEPATCH module-specific"
added a TAINT_LIVEPATCH flag to the module-specific taint flags.  This
commit is v4.9+ and the modules taint field is an unsigned int.

Upstream 7fd8329ba502 "taint/module: Clean up global and module taint
flags handling" modified the modules taint field to be an unsigned long.
This commit is v4.10+.

Adjust the module tainting code in kpatch_register() to consider v4.9
kernels as well as v4.10 (and any distro-specific behavior).

Fixes: #666.
This commit is contained in:
Joe Lawrence 2017-02-02 09:58:04 -05:00
parent 8e1aef2893
commit d62a9aa996
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kmod/core/core.c
View File

@ -977,10 +977,13 @@ int kpatch_register(struct kpatch_module *kpmod, bool replace)
} while_for_each_linked_func();
/* HAS_MODULE_TAINT - upstream 2992ef29ae01 "livepatch/module: make TAINT_LIVEPATCH module-specific" */
/* HAS_MODULE_TAINT_LONG - upstream 7fd8329ba502 "taint/module: Clean up global and module taint flags handling" */
#ifdef RHEL_RELEASE_CODE
# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)
# define HAS_RHEL7_MODULE_TAINT
# define HAS_MODULE_TAINT
# endif
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
# define HAS_MODULE_TAINT_LONG
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
# define HAS_MODULE_TAINT
#endif
@ -988,9 +991,9 @@ int kpatch_register(struct kpatch_module *kpmod, bool replace)
#ifdef TAINT_LIVEPATCH
pr_notice_once("tainting kernel with TAINT_LIVEPATCH\n");
add_taint(TAINT_LIVEPATCH, LOCKDEP_STILL_OK);
# ifdef HAS_MODULE_TAINT
# ifdef HAS_MODULE_TAINT_LONG
set_bit(TAINT_LIVEPATCH, &kpmod->mod->taints);
# elif defined(HAS_RHEL7_MODULE_TAINT)
# elif defined(HAS_MODULE_TAINT)
kpmod->mod->taints |= (1 << TAINT_LIVEPATCH);
# endif
#else