---

yaml --- r: 283229 b: refs/heads/master c: 7845bc3 h: refs/heads/master i: 283227: 9128762 v: v3
git-mirror · Nov 16, 2011 · e1b962e · e1b962e
1 parent 14a651f
commit e1b962e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24942c8e5cc8696064ee207ff29d4cf21f70dafc
+refs/heads/master: 7845bc3964756240863ae453ffe4f7ee27ddc954
diff --git a/trunk/include/linux/key-type.h b/trunk/include/linux/key-type.h
@@ -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;

diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c
@@ -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);