diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-12-30 15:35:30 +0300 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-02-21 17:06:12 +0300 |
commit | a1db74209483a24c861c848b4bb79a4d945ef6fa (patch) | |
tree | 4edf4c1a22e4a8446166366e5cee358c99e8fda0 /include/linux/security.h | |
parent | b844f0ecbc5626ec26cfc70cb144a4c9b85dc3f2 (diff) | |
download | linux-a1db74209483a24c861c848b4bb79a4d945ef6fa.tar.xz |
module: replace copy_module_from_fd with kernel version
Replace copy_module_from_fd() with kernel_read_file_from_fd().
Although none of the upstreamed LSMs define a kernel_module_from_file
hook, IMA is called, based on policy, to prevent unsigned kernel modules
from being loaded by the original kernel module syscall and to
measure/appraise signed kernel modules.
The security function security_kernel_module_from_file() was called prior
to reading a kernel module. Preventing unsigned kernel modules from being
loaded by the original kernel module syscall remains on the pre-read
kernel_read_file() security hook. Instead of reading the kernel module
twice, once for measuring/appraising and again for loading the kernel
module, the signature validation is moved to the kernel_post_read_file()
security hook.
This patch removes the security_kernel_module_from_file() hook and security
call.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 071fb747fdbb..157f0cb1e4d2 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -859,11 +859,6 @@ static inline int security_kernel_module_request(char *kmod_name) return 0; } -static inline int security_kernel_module_from_file(struct file *file) -{ - return 0; -} - static inline int security_kernel_read_file(struct file *file, enum kernel_read_file_id id) { |