From 2311c3a99160fa4c55ab19847d8cf791ec3ad227 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 4 Aug 2005 13:07:07 -0700
Subject: [PATCH] --- yaml --- r: 5649 b: refs/heads/master c:
 94efe72f762e2c147d8146d637d5ece5614c8d94 h: refs/heads/master i:   5647:
 9de3f903812bd705f74360013a15d3b36d69e56c v: v3

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

diff --git a/[refs] b/[refs]
index 726a1c6c3980..a23c2254ddca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf945d36fa0598f41ac4ad46a9dc43135460263
+refs/heads/master: 94efe72f762e2c147d8146d637d5ece5614c8d94
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
index a1f6bac647a1..9c208c756df8 100644
--- a/trunk/security/keys/keyring.c
+++ b/trunk/security/keys/keyring.c
@@ -201,7 +201,11 @@ static void keyring_destroy(struct key *keyring)
 
 	if (keyring->description) {
 		write_lock(&keyring_name_lock);
-		list_del(&keyring->type_data.link);
+
+		if (keyring->type_data.link.next != NULL &&
+		    !list_empty(&keyring->type_data.link))
+			list_del(&keyring->type_data.link);
+
 		write_unlock(&keyring_name_lock);
 	}