diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 6 | ||||
| -rw-r--r-- | security/security.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/security/capability.c b/security/capability.c index e76373de3129..a74fde6a7468 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -401,6 +401,11 @@ static int cap_kernel_create_files_as(struct cred *new, struct inode *inode) | |||
| 401 | return 0; | 401 | return 0; |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | static int cap_kernel_fw_from_file(struct file *file, char *buf, size_t size) | ||
| 405 | { | ||
| 406 | return 0; | ||
| 407 | } | ||
| 408 | |||
| 404 | static int cap_kernel_module_request(char *kmod_name) | 409 | static int cap_kernel_module_request(char *kmod_name) |
| 405 | { | 410 | { |
| 406 | return 0; | 411 | return 0; |
| @@ -1015,6 +1020,7 @@ void __init security_fixup_ops(struct security_operations *ops) | |||
| 1015 | set_to_cap_if_null(ops, cred_transfer); | 1020 | set_to_cap_if_null(ops, cred_transfer); |
| 1016 | set_to_cap_if_null(ops, kernel_act_as); | 1021 | set_to_cap_if_null(ops, kernel_act_as); |
| 1017 | set_to_cap_if_null(ops, kernel_create_files_as); | 1022 | set_to_cap_if_null(ops, kernel_create_files_as); |
| 1023 | set_to_cap_if_null(ops, kernel_fw_from_file); | ||
| 1018 | set_to_cap_if_null(ops, kernel_module_request); | 1024 | set_to_cap_if_null(ops, kernel_module_request); |
| 1019 | set_to_cap_if_null(ops, kernel_module_from_file); | 1025 | set_to_cap_if_null(ops, kernel_module_from_file); |
| 1020 | set_to_cap_if_null(ops, task_fix_setuid); | 1026 | set_to_cap_if_null(ops, task_fix_setuid); |
diff --git a/security/security.c b/security/security.c index 31614e9e96e5..35d37d0f0d49 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -845,6 +845,12 @@ 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 | return security_ops->kernel_fw_from_file(file, buf, size); | ||
| 851 | } | ||
| 852 | EXPORT_SYMBOL_GPL(security_kernel_fw_from_file); | ||
| 853 | |||
| 848 | int security_kernel_module_request(char *kmod_name) | 854 | int security_kernel_module_request(char *kmod_name) |
| 849 | { | 855 | { |
| 850 | return security_ops->kernel_module_request(kmod_name); | 856 | return security_ops->kernel_module_request(kmod_name); |
