keys: Export lookup_user_key to external users

Export lookup_user_key() symbol in order to allow nvdimm passphrase
update to retrieve user injected keys.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/include/linux/key.h b/include/linux/key.h
index e58ee10f6e585f59be794f6c27be1d8d148abac0..7099985e35a99fbfd2cd783d1c5995f436dd06ed 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -346,6 +346,9 @@ static inline key_serial_t key_serial(const struct key *key)
 
 extern void key_set_timeout(struct key *, unsigned);
 
+extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
+                                key_perm_t perm);
+
 /*
  * The permissions required on a key that we're looking up.
  */

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 74cb0ff42fedbca403a282058be7219109b1b3c6..479909b858c7f1a4fa0c5b36cc963170a2fb215b 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -158,8 +158,6 @@ extern struct key *request_key_and_link(struct key_type *type,
 
 extern bool lookup_user_key_possessed(const struct key *key,
                                      const struct key_match_data *match_data);
-extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
-                                key_perm_t perm);
 #define KEY_LOOKUP_CREATE      0x01
 #define KEY_LOOKUP_PARTIAL     0x02
 #define KEY_LOOKUP_FOR_UNLINK  0x04

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index d5b25e535d3a5ad2ef567015bc4915d06b9f3f5e..ec4fd45312246e0c09cd7c5e1e3432c74f2e3431 100644 (file)
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -755,6 +755,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
        put_cred(ctx.cred);
        goto try_again;
 }
+EXPORT_SYMBOL(lookup_user_key);
 
 /*
  * Join the named keyring as the session keyring if possible else attempt to