Merge tag 'blob-stacking-security-next' of https://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-block.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 232db019f0519f6af292eb5db97d300856eb1bd9..52e04136bfa81aa4af70a5e32a8ab41bb9bc8ee4 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -1362,10 +1362,17 @@ struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(vm_enough_memory, cap_vm_enough_memory),
 };
 
-void __init capability_add_hooks(void)
+static int __init capability_init(void)
 {
        security_add_hooks(capability_hooks, ARRAY_SIZE(capability_hooks),
                                "capability");
+       return 0;
 }
 
+DEFINE_LSM(capability) = {
+       .name = "capability",
+       .order = LSM_ORDER_FIRST,
+       .init = capability_init,
+};
+
 #endif /* CONFIG_SECURITY */