Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / security / keys / permission.c

diff --git a/security/keys/permission.c b/security/keys/permission.c
index efcc0c855a0db1284ee3debcb9be64823d9be3ed..732cc0beffdfc74b74eddbf173ee30bd9d0455db 100644 (file)
--- a/security/keys/permission.c
+++ b/security/keys/permission.c
@@ -28,7 +28,7 @@
  * permissions bits or the LSM check.
  */
 int key_task_permission(const key_ref_t key_ref, const struct cred *cred,
-                       key_perm_t perm)
+                       unsigned perm)
 {
        struct key *key;
        key_perm_t kperm;
@@ -68,7 +68,7 @@ use_these_perms:
        if (is_key_possessed(key_ref))
                kperm |= key->perm >> 24;
 
-       kperm = kperm & perm & KEY_ALL;
+       kperm = kperm & perm & KEY_NEED_ALL;
 
        if (kperm != perm)
                return -EACCES;