Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / key-ui.h

diff --git a/include/linux/key-ui.h b/include/linux/key-ui.h
index 60cc7b7..e8b8a7a 100644 (file)
--- a/include/linux/key-ui.h
+++ b/include/linux/key-ui.h
@@ -1,4 +1,4 @@
-/* key-ui.h: key userspace interface stuff for use by keyfs
+/* key-ui.h: key userspace interface stuff
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
@@ -24,67 +24,36 @@ extern spinlock_t key_serial_lock;
 #define        KEY_WRITE       0x04    /* require permission to update / modify */
 #define        KEY_SEARCH      0x08    /* require permission to search (keyring) or find (key) */
 #define        KEY_LINK        0x10    /* require permission to link */
-#define        KEY_ALL         0x1f    /* all the above permissions */
+#define        KEY_SETATTR     0x20    /* require permission to change attributes */
+#define        KEY_ALL         0x3f    /* all the above permissions */
 
 /*
  * the keyring payload contains a list of the keys to which the keyring is
  * subscribed
  */
 struct keyring_list {
-       unsigned        maxkeys;        /* max keys this list can hold */
-       unsigned        nkeys;          /* number of keys currently held */
+       struct rcu_head rcu;            /* RCU deletion hook */
+       unsigned short  maxkeys;        /* max keys this list can hold */
+       unsigned short  nkeys;          /* number of keys currently held */
+       unsigned short  delkey;         /* key to be unlinked by RCU */
        struct key      *keys[0];
 };
 
-
 /*
  * check to see whether permission is granted to use a key in the desired way
  */
-static inline int key_permission(const struct key *key, key_perm_t perm)
-{
-       key_perm_t kperm;
-
-       if (key->uid == current->fsuid)
-               kperm = key->perm >> 16;
-       else if (key->gid != -1 &&
-                key->perm & KEY_GRP_ALL &&
-                in_group_p(key->gid)
-                )
-               kperm = key->perm >> 8;
-       else
-               kperm = key->perm;
-
-       kperm = kperm & perm & KEY_ALL;
-
-       return kperm == perm;
-}
+extern int key_task_permission(const key_ref_t key_ref,
+                              struct task_struct *context,
+                              key_perm_t perm);
 
-/*
- * check to see whether permission is granted to use a key in at least one of
- * the desired ways
- */
-static inline int key_any_permission(const struct key *key, key_perm_t perm)
+static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)
 {
-       key_perm_t kperm;
-
-       if (key->uid == current->fsuid)
-               kperm = key->perm >> 16;
-       else if (key->gid != -1 &&
-                key->perm & KEY_GRP_ALL &&
-                in_group_p(key->gid)
-                )
-               kperm = key->perm >> 8;
-       else
-               kperm = key->perm;
-
-       kperm = kperm & perm & KEY_ALL;
-
-       return kperm != 0;
+       return key_task_permission(key_ref, current, perm);
 }
 
-
-extern struct key *lookup_user_key(key_serial_t id, int create, int part,
-                                  key_perm_t perm);
+extern key_ref_t lookup_user_key(struct task_struct *context,
+                                key_serial_t id, int create, int partial,
+                                key_perm_t perm);
 
 extern long join_session_keyring(const char *name);