Commit 7845bc39 authored by David Howells's avatar David Howells Committed by James Morris
Browse files

KEYS: Give key types their own lockdep class for key->sem 



Give keys their own lockdep class to differentiate them from each other in case
a key of one type has to refer to a key of another type.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 24942c8e

include/linux/key-type.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct key_type { 


	/* internal fields */

	struct list_head	link;		/* link in types list */

	struct lock_class_key	lock_class;	/* key->sem lock class */

};



extern struct key_type key_type_keyring;

security/keys/key.c

+3 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ struct key *key_alloc(struct key_type *type, const char *desc, 


	atomic_set(&key->usage, 1);

	init_rwsem(&key->sem);

	lockdep_set_class(&key->sem, &type->lock_class);

	key->type = type;

	key->user = user;

	key->quotalen = quotalen;
@@ -946,6 +947,8 @@ int register_key_type(struct key_type *ktype) 
	struct key_type *p;

	int ret;



	memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));



	ret = -EEXIST;

	down_write(&key_types_sem);