diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-08 09:02:16 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-08 09:02:16 -0700 |
| commit | cb10479cfa3b94edd4d4bb62398660fe963f7400 (patch) | |
| tree | 1c8210298c33263c5f2d15539f48981c9b810825 /security | |
| parent | 0257f99a4d4d0d4abcb82dd873ceda446a9a8bba (diff) | |
| parent | b65ef4723782d7e5f75604ba17bf5dd6e41c1d57 (diff) | |
Merge "Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4"
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 696ccfa08d10..31898856682e 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct blkcipher_desc *desc, const u8 *key, static struct key *request_master_key(struct encrypted_key_payload *epayload, const u8 **master_key, size_t *master_keylen) { - struct key *mkey = NULL; + struct key *mkey = ERR_PTR(-EINVAL); if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX, KEY_TRUSTED_PREFIX_LEN)) { |