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);
 	}