libata: fix probe_ent alloc/free bugs

[powerpc.git] / Documentation / keys.txt

diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index 61c0fad..60c665d 100644 (file)
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -304,7 +304,7 @@ about the status of the key service:
        R       Revoked
        D       Dead
        Q       Contributes to user's quota
        R       Revoked
        D       Dead
        Q       Contributes to user's quota

-       U       Under contruction by callback to userspace
+       U       Under construction by callback to userspace

        N       Negative key
 
      This file must be enabled at kernel configuration time as it allows anyone
        N       Negative key
 
      This file must be enabled at kernel configuration time as it allows anyone


@@ -671,7 +671,7 @@ The keyctl syscall functions are:
 
      Note that this setting is inherited across fork/exec.
 
 
      Note that this setting is inherited across fork/exec.
 

-     [1] The default default is: the thread keyring if there is one, otherwise
+     [1] The default is: the thread keyring if there is one, otherwise

      the process keyring if there is one, otherwise the session keyring if
      there is one, otherwise the user default session keyring.
 
      the process keyring if there is one, otherwise the session keyring if
      there is one, otherwise the user default session keyring.
 


@@ -708,14 +708,14 @@ The keyctl syscall functions are:
 
      If the specified key is 0, then any assumed authority will be divested.
 
 
      If the specified key is 0, then any assumed authority will be divested.
 

-     The assumed authorititive key is inherited across fork and exec.
+     The assumed authoritative key is inherited across fork and exec.

 
 
 ===============
 KERNEL SERVICES
 ===============
 
 
 
 ===============
 KERNEL SERVICES
 ===============
 

-The kernel services for key managment are fairly simple to deal with. They can
+The kernel services for key management are fairly simple to deal with. They can

 be broken down into two areas: keys and key types.
 
 Dealing with keys is fairly straightforward. Firstly, the kernel service
 be broken down into two areas: keys and key types.
 
 Dealing with keys is fairly straightforward. Firstly, the kernel service


@@ -780,6 +780,17 @@ payload contents" for more information.
     See also Documentation/keys-request-key.txt.
 
 
     See also Documentation/keys-request-key.txt.
 
 

+(*) To search for a key, passing auxiliary data to the upcaller, call:
+
+       struct key *request_key_with_auxdata(const struct key_type *type,
+                                            const char *description,
+                                            const char *callout_string,
+                                            void *aux);
+
+    This is identical to request_key(), except that the auxiliary data is
+    passed to the key_type->request_key() op if it exists.
+
+

 (*) When it is no longer required, the key should be released using:
 
        void key_put(struct key *key);
 (*) When it is no longer required, the key should be released using:
 
        void key_put(struct key *key);


@@ -1031,6 +1042,24 @@ The structure has a number of fields, some of which are mandatory:
      as might happen when the userspace buffer is accessed.
 
 
      as might happen when the userspace buffer is accessed.
 
 

+ (*) int (*request_key)(struct key *key, struct key *authkey, const char *op,
+                       void *aux);
+
+     This method is optional.  If provided, request_key() and
+     request_key_with_auxdata() will invoke this function rather than
+     upcalling to /sbin/request-key to operate upon a key of this type.
+
+     The aux parameter is as passed to request_key_with_auxdata() or is NULL
+     otherwise.  Also passed are the key to be operated upon, the
+     authorisation key for this operation and the operation type (currently
+     only "create").
+
+     This function should return only when the upcall is complete.  Upon return
+     the authorisation key will be revoked, and the target key will be
+     negatively instantiated if it is still uninstantiated.  The error will be
+     returned to the caller of request_key*().
+
+

 ============================
 REQUEST-KEY CALLBACK SERVICE
 ============================
 ============================
 REQUEST-KEY CALLBACK SERVICE
 ============================