From f9c3aa263d24608fc288745db74ce35b7acad266 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 2 Sep 2009 09:13:55 +0100
Subject: [PATCH] --- yaml --- r: 157341 b: refs/heads/master c:
 f041ae2f99d49adc914153a34a2d0e14e4389d90 h: refs/heads/master i:   157339:
 973295e4d4440e86a5b714882729713d829fddbb v: v3

---
 [refs]                    | 2 +-
 trunk/security/keys/key.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 492646f27938..5ae909f26ed9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c2c9a3fc77e8b60d43d9bd2ca46eb4dddb0ff76
+refs/heads/master: f041ae2f99d49adc914153a34a2d0e14e4389d90
diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c
index 3762d5b1ce64..bd9d2670e9c4 100644
--- a/trunk/security/keys/key.c
+++ b/trunk/security/keys/key.c
@@ -956,8 +956,10 @@ void unregister_key_type(struct key_type *ktype)
 	for (_n = rb_first(&key_serial_tree); _n; _n = rb_next(_n)) {
 		key = rb_entry(_n, struct key, serial_node);
 
-		if (key->type == ktype)
+		if (key->type == ktype) {
 			key->type = &key_type_dead;
+			set_bit(KEY_FLAG_DEAD, &key->flags);
+		}
 	}
 
 	spin_unlock(&key_serial_lock);