diff options
author | 2014-11-12 15:09:01 +0100 | |
---|---|---|
committer | 2014-11-12 15:09:01 +0100 | |
commit | 890ca861f868a10617029ffc87eae7d48ea6876c (patch) | |
tree | 713383f4e3bbd94ddb9816a25e6b3911511908f1 /security/security.c | |
parent | x86, msr: Use seek definitions instead of hard-coded values (diff) | |
parent | Linux 3.18-rc4 (diff) | |
download | wireguard-linux-890ca861f868a10617029ffc87eae7d48ea6876c.tar.xz wireguard-linux-890ca861f868a10617029ffc87eae7d48ea6876c.zip |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-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) return security_ops->file_fcntl(file, cmd, arg); } -int security_file_set_fowner(struct file *file) +void security_file_set_fowner(struct file *file) { - return security_ops->file_set_fowner(file); + security_ops->file_set_fowner(file); } 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) return security_ops->kernel_create_files_as(new, inode); } +int security_kernel_fw_from_file(struct file *file, char *buf, size_t size) +{ + int ret; + + ret = security_ops->kernel_fw_from_file(file, buf, size); + if (ret) + return ret; + return ima_fw_from_file(file, buf, size); +} +EXPORT_SYMBOL_GPL(security_kernel_fw_from_file); + int security_kernel_module_request(char *kmod_name) { return security_ops->kernel_module_request(kmod_name); |