summaryrefslogtreecommitdiffstats
path: root/keyring-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'keyring-fix.patch')
-rw-r--r--keyring-fix.patch17
1 files changed, 0 insertions, 17 deletions
diff --git a/keyring-fix.patch b/keyring-fix.patch
deleted file mode 100644
index 6539144e4..000000000
--- a/keyring-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-@@ -, +, @@
----
---- a/security/keys/keyring.c
-+++ a/security/keys/keyring.c
-@@ -1000,7 +1000,11 @@ static int keyring_detect_cycle_iterator(const void *object,
-
- kenter("{%d}", key->serial);
-
-- BUG_ON(key != ctx->match_data);
-+ /* We might get a keyring with matching index-key that is nonetheless a
-+ * different keyring. */
-+ if (key != ctx->match_data)
-+ return 0;
-+
- ctx->result = ERR_PTR(-EDEADLK);
- return 1;
- }