aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2016-01-24 10:07:32 -0500
committerMimi Zohar <zohar@linux.vnet.ibm.com>2016-02-18 17:14:04 -0500
commitbc8ca5b92d54f6f005fa73ad546f02fca26ddd85 (patch)
tree53ad32a55de2d6e932af0328747a4ea781970175 /security
parentvfs: define a generic function to read a file from the kernel (diff)
downloadlinux-dev-bc8ca5b92d54f6f005fa73ad546f02fca26ddd85.tar.xz
linux-dev-bc8ca5b92d54f6f005fa73ad546f02fca26ddd85.zip
vfs: define kernel_read_file_id enumeration
To differentiate between the kernel_read_file() callers, this patch defines a new enumeration named kernel_read_file_id and includes the caller identifier as an argument. Subsequent patches define READING_KEXEC_IMAGE, READING_KEXEC_INITRAMFS, READING_FIRMWARE, READING_MODULE, and READING_POLICY. Changelog v3: - Replace the IMA specific enumeration with a generic one. 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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/security.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c
index c98dd6bf4ebd..5b96eabaafd4 100644
--- a/security/security.c
+++ b/security/security.c
@@ -910,9 +910,10 @@ int security_kernel_module_from_file(struct file *file)
return ima_module_check(file);
}
-int security_kernel_post_read_file(struct file *file, char *buf, loff_t size)
+int security_kernel_post_read_file(struct file *file, char *buf, loff_t size,
+ enum kernel_read_file_id id)
{
- return call_int_hook(kernel_post_read_file, 0, file, buf, size);
+ return call_int_hook(kernel_post_read_file, 0, file, buf, size, id);
}
EXPORT_SYMBOL_GPL(security_kernel_post_read_file);