xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: unconditionally compile sig_ok in struct module

Browse Source 
The generic kernel image must have module signing disabled so it can
load kernel modules from all vendors. Unfortunately loading a signed
kernel module into a kernel with module signing disabled will fail
because struct module_layout (which appears in kernel modules) contains
struct module, and struct module contains the sig_ok field, which is
conditionally compiled depending on CONFIG_MODULE_SIG (module signing).

Unconditionally compile the sig_ok field to work around this problem.

Bug: 135940219
Test: load a signed kernel module with module signing disabled
Change-Id: I5cc437c806f74f89c0e45ce4135136ca0c70738e
Signed-off-by: Steve Muckle <smuckle@google.com>
This commit is contained in:
Steve Muckle
2019-10-17 12:14:13 -07:00
parent b4b23f08d8
commit b19c4dfb4b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/module.h
View File

@@ -389,10 +389,12 @@ struct module {
const s32 *unused_gpl_crcs;
#endif
#ifdef CONFIG_MODULE_SIG
/* Signature was verified. */
/*
* Signature was verified. Unconditionally compiled in Android to
* preserve ABI compatibility between kernels without module
* signing enabled and signed modules.
*/
bool sig_ok;
#endif
bool async_probe_requested;