diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
| commit | 5289d9c979092878f2bf741d8b365ef7565fb6db (patch) | |
| tree | 845756bb908fddedb3d88515fe0b8d7ad04fc567 /security | |
| parent | 91e52df3ad8b9c84c4f6f050e0f14127894dd8ce (diff) | |
| parent | 9e0499d7d30c6a91eb381e604c31519af88737d7 (diff) | |
Merge tag 'v4.4.77' into linux-linaro-lsk-v4.4
This is the 4.4.77 stable release
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)) { |