diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-02-09 17:17:52 +0000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-02-10 12:43:49 +1100 |
| commit | 57cb17e764ba0aaa169d07796acce54ccfbc6cae (patch) | |
| tree | 359698fe620eb8e0eaad87c08649455d68650f48 /security/keys | |
| parent | f86880175d0db2e3f2e27c24881dd9b395b0b920 (diff) | |
| download | linux-57cb17e764ba0aaa169d07796acce54ccfbc6cae.tar.gz linux-57cb17e764ba0aaa169d07796acce54ccfbc6cae.tar.bz2 linux-57cb17e764ba0aaa169d07796acce54ccfbc6cae.zip | |
KEYS: Fix an error code in request_master_key()
This function has two callers and neither are able to handle a NULL
return. Really, -EINVAL is the correct thing return here anyway. This
fixes some static checker warnings like:
security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt()
error: uninitialized symbol 'master_key'.
Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/keys')
| -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 17a06105ccb6..d7a4969b2dd3 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -437,7 +437,7 @@ static struct skcipher_request *init_skcipher_req(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)) { |