Skip to content

Commit 1eb1bcf

Browse files
committed
KEYS: Announce key type (un)registration
Announce the (un)registration of a key type in the core key code rather than in the callers. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Mimi Zohar <zohar@us.ibm.com>
1 parent 9f7ce8e commit 1eb1bcf

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

net/dns_resolver/dns_key.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@ static int __init init_dns_resolver(void)
249249
struct key *keyring;
250250
int ret;
251251

252-
printk(KERN_NOTICE "Registering the %s key type\n",
253-
key_type_dns_resolver.name);
254-
255252
/* create an override credential set with a special thread keyring in
256253
* which DNS requests are cached
257254
*
@@ -301,8 +298,6 @@ static void __exit exit_dns_resolver(void)
301298
key_revoke(dns_resolver_cache->thread_keyring);
302299
unregister_key_type(&key_type_dns_resolver);
303300
put_cred(dns_resolver_cache);
304-
printk(KERN_NOTICE "Unregistered %s key type\n",
305-
key_type_dns_resolver.name);
306301
}
307302

308303
module_init(init_dns_resolver)

security/keys/key.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,8 @@ int register_key_type(struct key_type *ktype)
980980

981981
/* store the type */
982982
list_add(&ktype->link, &key_types_list);
983+
984+
pr_notice("Key type %s registered\n", ktype->name);
983985
ret = 0;
984986

985987
out:
@@ -1002,6 +1004,7 @@ void unregister_key_type(struct key_type *ktype)
10021004
list_del_init(&ktype->link);
10031005
downgrade_write(&key_types_sem);
10041006
key_gc_keytype(ktype);
1007+
pr_notice("Key type %s unregistered\n", ktype->name);
10051008
up_read(&key_types_sem);
10061009
}
10071010
EXPORT_SYMBOL(unregister_key_type);

0 commit comments

Comments
 (0)