diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-10-22 03:39:41 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-12-13 21:35:23 -0500 |
commit | 2f3238aebedb243804f58d62d57244edec4149b2 (patch) | |
tree | 984f7f4a6b2225649120c55a7b89e65e9de55ee2 /include | |
parent | 34e1169d996ab148490c01b65b4ee371cf8ffba2 (diff) |
module: add flags arg to sys_finit_module()
Thanks to Michael Kerrisk for keeping us honest. These flags are actually
useful for eliminating the only case where kmod has to mangle a module's
internals: for overriding module versioning.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Acked-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/syscalls.h | 2 | ||||
-rw-r--r-- | include/uapi/linux/module.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 32bc035bcd68..8cf7b508cb50 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -868,5 +868,5 @@ asmlinkage long sys_process_vm_writev(pid_t pid, | |||
868 | 868 | ||
869 | asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type, | 869 | asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type, |
870 | unsigned long idx1, unsigned long idx2); | 870 | unsigned long idx1, unsigned long idx2); |
871 | asmlinkage long sys_finit_module(int fd, const char __user *uargs); | 871 | asmlinkage long sys_finit_module(int fd, const char __user *uargs, int flags); |
872 | #endif | 872 | #endif |
diff --git a/include/uapi/linux/module.h b/include/uapi/linux/module.h new file mode 100644 index 000000000000..38da4258b12f --- /dev/null +++ b/include/uapi/linux/module.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef _UAPI_LINUX_MODULE_H | ||
2 | #define _UAPI_LINUX_MODULE_H | ||
3 | |||
4 | /* Flags for sys_finit_module: */ | ||
5 | #define MODULE_INIT_IGNORE_MODVERSIONS 1 | ||
6 | #define MODULE_INIT_IGNORE_VERMAGIC 2 | ||
7 | |||
8 | #endif /* _UAPI_LINUX_MODULE_H */ | ||