apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'v3.14' into next

Browse Source
This commit is contained in:
James Morris
2014-04-14 11:23:14 +10:00
parent f64410ec66 455c6fdbd2
commit ecd740c6f2
10534 changed files with 562171 additions and 220609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/keys/keyring.c
+5 -1
View File
@@ -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;
}