diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-14 22:31:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:31:55 -0400 |
| commit | 85dcce7a73f1cc59f7a96fe52713b1630f4ca272 (patch) | |
| tree | 6c645923eb2f0152073b90685ce80e46cfb7afed /security | |
| parent | 4c4e4113db249c828fffb286bc95ffb255e081f5 (diff) | |
| parent | a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a (diff) | |
| download | linux-85dcce7a73f1cc59f7a96fe52713b1630f4ca272.tar.gz linux-85dcce7a73f1cc59f7a96fe52713b1630f4ca272.tar.bz2 linux-85dcce7a73f1cc59f7a96fe52713b1630f4ca272.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
drivers/net/xen-netback/netback.c
Both the r8152 and netback conflicts were simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/keyring.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index d46cbc5e335e..2fb2576dc644 100644 --- a/security/keys/keyring.c +++ b/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; } |