diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 31614e9e96e5..18b35c63fc0c 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -775,9 +775,9 @@ int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg) | |||
775 | return security_ops->file_fcntl(file, cmd, arg); | 775 | return security_ops->file_fcntl(file, cmd, arg); |
776 | } | 776 | } |
777 | 777 | ||
778 | int security_file_set_fowner(struct file *file) | 778 | void security_file_set_fowner(struct file *file) |
779 | { | 779 | { |
780 | return security_ops->file_set_fowner(file); | 780 | security_ops->file_set_fowner(file); |
781 | } | 781 | } |
782 | 782 | ||
783 | int security_file_send_sigiotask(struct task_struct *tsk, | 783 | int security_file_send_sigiotask(struct task_struct *tsk, |
@@ -845,6 +845,17 @@ int security_kernel_create_files_as(struct cred *new, struct inode *inode) | |||
845 | return security_ops->kernel_create_files_as(new, inode); | 845 | return security_ops->kernel_create_files_as(new, inode); |
846 | } | 846 | } |
847 | 847 | ||
848 | int security_kernel_fw_from_file(struct file *file, char *buf, size_t size) | ||
849 | { | ||
850 | int ret; | ||
851 | |||
852 | ret = security_ops->kernel_fw_from_file(file, buf, size); | ||
853 | if (ret) | ||
854 | return ret; | ||
855 | return ima_fw_from_file(file, buf, size); | ||
856 | } | ||
857 | EXPORT_SYMBOL_GPL(security_kernel_fw_from_file); | ||
858 | |||
848 | int security_kernel_module_request(char *kmod_name) | 859 | int security_kernel_module_request(char *kmod_name) |
849 | { | 860 | { |
850 | return security_ops->kernel_module_request(kmod_name); | 861 | return security_ops->kernel_module_request(kmod_name); |