diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-27 09:35:02 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-27 09:35:02 (GMT) |
| commit | 630741fb60ac4e286f5396403c0d864d924c02bc (patch) | |
| tree | 16eb952c3653386c6d1ad99e369615dfe65e4d67 /security/keys/key.c | |
| parent | 807e5b80687c06715d62df51a5473b231e3e8b15 (diff) | |
| parent | ea1dc6fc6242f991656e35e2ed3d90ec1cd13418 (diff) | |
| download | linux-630741fb60ac4e286f5396403c0d864d924c02bc.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index bd5a272..346fbf2 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key, mutex_unlock(&key_construction_mutex); - if (keyring) + if (keyring && link_ret == 0) __key_link_end(keyring, &key->index_key, edit); /* wake up anyone waiting for a key to be constructed */ |