Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel...

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

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