aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/lsm_hooks.h
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 /include/linux/lsm_hooks.h
parentb44a7dfc6fa16e01f2497c9fa62c3926f94be174 (diff)
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 'include/linux/lsm_hooks.h')
-rw-r--r--include/linux/lsm_hooks.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index f82631cc7248..2337f33913c1 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -567,6 +567,7 @@
567 * by the kernel. 567 * by the kernel.
568 * @buf pointer to buffer containing the file contents. 568 * @buf pointer to buffer containing the file contents.
569 * @size length of the file contents. 569 * @size length of the file contents.
570 * @id kernel read file identifier
570 * Return 0 if permission is granted. 571 * Return 0 if permission is granted.
571 * @task_fix_setuid: 572 * @task_fix_setuid:
572 * Update the module's state after setting one or more of the user 573 * Update the module's state after setting one or more of the user
@@ -1464,7 +1465,8 @@ union security_list_options {
1464 int (*kernel_fw_from_file)(struct file *file, char *buf, size_t size); 1465 int (*kernel_fw_from_file)(struct file *file, char *buf, size_t size);
1465 int (*kernel_module_request)(char *kmod_name); 1466 int (*kernel_module_request)(char *kmod_name);
1466 int (*kernel_module_from_file)(struct file *file); 1467 int (*kernel_module_from_file)(struct file *file);
1467 int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size); 1468 int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size,
1469 enum kernel_read_file_id id);
1468 int (*task_fix_setuid)(struct cred *new, const struct cred *old, 1470 int (*task_fix_setuid)(struct cred *new, const struct cred *old,
1469 int flags); 1471 int flags);
1470 int (*task_setpgid)(struct task_struct *p, pid_t pgid); 1472 int (*task_setpgid)(struct task_struct *p, pid_t pgid);