summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-30 18:23:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-30 18:23:26 -0700
commitbc7b1189ea30a1ac8ba6fd76400d67188ff40445 (patch)
treeafabb9ea6d8d362f30fc4dc661798f830c6e5831
parent46692be6dd06ce405cb09cf8338b1f0edbbfb295 (diff)
parent36a17319dc136d10cf44c242c8b957e2d3083710 (diff)
Merge "KEYS: potential uninitialized variable"
-rw-r--r--security/keys/key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c
index ab7997ded725..534808915371 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -578,7 +578,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 */