Merge tag 'keys-misc-20190619' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull misc keyring updates from David Howells:
 "These are some miscellaneous keyrings fixes and improvements:

   - Fix a bunch of warnings from sparse, including missing RCU bits and
     kdoc-function argument mismatches

   - Implement a keyctl to allow a key to be moved from one keyring to
     another, with the option of prohibiting key replacement in the
     destination keyring.

   - Grant Link permission to possessors of request_key_auth tokens so
     that upcall servicing daemons can more easily arrange things such
     that only the necessary auth key is passed to the actual service
     program, and not all the auth keys a daemon might possesss.

   - Improvement in lookup_user_key().

   - Implement a keyctl to allow keyrings subsystem capabilities to be
     queried.

  The keyutils next branch has commits to make available, document and
  test the move-key and capabilities code:

        https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/log

  They're currently on the 'next' branch"

* tag 'keys-misc-20190619' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  keys: Add capability-checking keyctl function
  keys: Reuse keyring_index_key::desc_len in lookup_user_key()
  keys: Grant Link permission to possessers of request_key auth keys
  keys: Add a keyctl to move a key between keyrings
  keys: Hoist locking out of __key_link_begin()
  keys: Break bits out of key_unlink()
  keys: Change keyring_serialise_link_sem to a mutex
  keys: sparse: Fix kdoc mismatches
  keys: sparse: Fix incorrect RCU accesses
  keys: sparse: Fix key_fs[ug]id_changed()

1 files changed, 9 insertions, 4 deletions

diff --git a/include/linux/key.h b/include/linux/key.h
index 1c8b88b455ef..8b297b94bfb3 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -305,6 +305,11 @@ extern int key_update(key_ref_t key,
 extern int key_link(struct key *keyring,
                     struct key *key);
 
+extern int key_move(struct key *key,
+                    struct key *from_keyring,
+                    struct key *to_keyring,
+                    unsigned int flags);
+
 extern int key_unlink(struct key *keyring,
                       struct key *key);
 
@@ -397,8 +402,8 @@ extern struct ctl_table key_sysctls[];
  * the userspace interface
  */
 extern int install_thread_keyring_to_cred(struct cred *cred);
-extern void key_fsuid_changed(struct task_struct *tsk);
-extern void key_fsgid_changed(struct task_struct *tsk);
+extern void key_fsuid_changed(struct cred *new_cred);
+extern void key_fsgid_changed(struct cred *new_cred);
 extern void key_init(void);
 
 #else /* CONFIG_KEYS */
@@ -413,8 +418,8 @@ extern void key_init(void);
 #define make_key_ref(k, p)              NULL
 #define key_ref_to_ptr(k)               NULL
 #define is_key_possessed(k)             0
-#define key_fsuid_changed(t)            do { } while(0)
-#define key_fsgid_changed(t)            do { } while(0)
+#define key_fsuid_changed(c)            do { } while(0)
+#define key_fsgid_changed(c)            do { } while(0)
 #define key_init()                      do { } while(0)
 
 #endif /* CONFIG_KEYS */