aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-07-25 15:19:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-25 15:19:11 +0000
commit3397732084da41e59fbece06242f64eb553c812a (patch)
tree86ea3623e65ed342fe87f7c2abe1b583f59ec327
parent2f681f61d36b01dc6f12b0161db68c3a074388b7 (diff)
parent2badfb6de382de691f742ada4230b789eb0e651f (diff)
downloadv4.4-3397732084da41e59fbece06242f64eb553c812a.tar.gz
UPSTREAM: KEYS: potential uninitialized variable
am: 2badfb6de3 Change-Id: I434736cf7224ee432183654f11c023a0362027f1
-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 */