diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 6 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/security/capability.c b/security/capability.c index ec0573054024..1b943f54b2ea 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -396,6 +396,11 @@ static int cap_kernel_create_files_as(struct cred *new, struct inode *inode) | |||
396 | return 0; | 396 | return 0; |
397 | } | 397 | } |
398 | 398 | ||
399 | static int cap_kernel_module_request(void) | ||
400 | { | ||
401 | return 0; | ||
402 | } | ||
403 | |||
399 | static int cap_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags) | 404 | static int cap_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags) |
400 | { | 405 | { |
401 | return 0; | 406 | return 0; |
@@ -945,6 +950,7 @@ void security_fixup_ops(struct security_operations *ops) | |||
945 | set_to_cap_if_null(ops, cred_commit); | 950 | set_to_cap_if_null(ops, cred_commit); |
946 | set_to_cap_if_null(ops, kernel_act_as); | 951 | set_to_cap_if_null(ops, kernel_act_as); |
947 | set_to_cap_if_null(ops, kernel_create_files_as); | 952 | set_to_cap_if_null(ops, kernel_create_files_as); |
953 | set_to_cap_if_null(ops, kernel_module_request); | ||
948 | set_to_cap_if_null(ops, task_setuid); | 954 | set_to_cap_if_null(ops, task_setuid); |
949 | set_to_cap_if_null(ops, task_fix_setuid); | 955 | set_to_cap_if_null(ops, task_fix_setuid); |
950 | set_to_cap_if_null(ops, task_setgid); | 956 | set_to_cap_if_null(ops, task_setgid); |
diff --git a/security/security.c b/security/security.c index 4501c5e1f988..0e993f42ce3d 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -709,6 +709,11 @@ int security_kernel_create_files_as(struct cred *new, struct inode *inode) | |||
709 | return security_ops->kernel_create_files_as(new, inode); | 709 | return security_ops->kernel_create_files_as(new, inode); |
710 | } | 710 | } |
711 | 711 | ||
712 | int security_kernel_module_request(void) | ||
713 | { | ||
714 | return security_ops->kernel_module_request(); | ||
715 | } | ||
716 | |||
712 | int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags) | 717 | int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags) |
713 | { | 718 | { |
714 | return security_ops->task_setuid(id0, id1, id2, flags); | 719 | return security_ops->task_setuid(id0, id1, id2, flags); |