keys: Replace uid/gid/perm permissions checking with an ACL

[sfrench/cifs-2.6.git] / certs / blacklist.c

diff --git a/certs/blacklist.c b/certs/blacklist.c
index 181cb7fa95400625363eb5cfd9e6347832b81998..39de9d68b21e2861b64d8a59505aeb491c20b073 100644 (file)
--- a/certs/blacklist.c
+++ b/certs/blacklist.c
@@ -93,8 +93,7 @@ int mark_hash_blacklisted(const char *hash)
                                   hash,
                                   NULL,
                                   0,
-                                  ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
-                                   KEY_USR_VIEW),
+                                  &internal_key_acl,
                                   KEY_ALLOC_NOT_IN_QUOTA |
                                   KEY_ALLOC_BUILT_IN);
        if (IS_ERR(key)) {
@@ -153,9 +152,7 @@ static int __init blacklist_init(void)
                keyring_alloc(".blacklist",
                              KUIDT_INIT(0), KGIDT_INIT(0),
                              current_cred(),
-                             (KEY_POS_ALL & ~KEY_POS_SETATTR) |
-                             KEY_USR_VIEW | KEY_USR_READ |
-                             KEY_USR_SEARCH,
+                             &internal_keyring_acl,
                              KEY_ALLOC_NOT_IN_QUOTA |
                              KEY_FLAG_KEEP,
                              NULL, NULL);