1 files changed, 25 insertions, 0 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 06783cffb3af..c9bf66ac36e0 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -955,6 +955,28 @@ void key_revoke(struct key *key)
 EXPORT_SYMBOL(key_revoke);
 
 /**
+ * key_invalidate - Invalidate a key.
+ * @key: The key to be invalidated.
+ *
+ * Mark a key as being invalidated and have it cleaned up immediately.  The key
+ * is ignored by all searches and other operations from this point.
+ */
+void key_invalidate(struct key *key)
+{
+        kenter("%d", key_serial(key));
+
+        key_check(key);
+
+        if (!test_bit(KEY_FLAG_INVALIDATED, &key->flags)) {
+                down_write_nested(&key->sem, 1);
+                if (!test_and_set_bit(KEY_FLAG_INVALIDATED, &key->flags))
+                        key_schedule_gc_links();
+                up_write(&key->sem);
+        }
+}
+EXPORT_SYMBOL(key_invalidate);
+
+/**
  * register_key_type - Register a type of key.
  * @ktype: The new key type.
  *
@@ -980,6 +1002,8 @@ int register_key_type(struct key_type *ktype)
 
         /* store the type */
         list_add(&ktype->link, &key_types_list);
+
+        pr_notice("Key type %s registered\n", ktype->name);
         ret = 0;
 
 out:
@@ -1002,6 +1026,7 @@ void unregister_key_type(struct key_type *ktype)
         list_del_init(&ktype->link);
         downgrade_write(&key_types_sem);
         key_gc_keytype(ktype);
+        pr_notice("Key type %s unregistered\n", ktype->name);
         up_read(&key_types_sem);
 }
 EXPORT_SYMBOL(unregister_key_type);