KEYS: Fix an error code in request_master_key()

commit 57cb17e764 upstream.

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: 7e70cb4978 ("keys: add new key-type encrypted")
Signed-off-by: Dan Carpenter <>
Acked-by: Mimi Zohar <>
Signed-off-by: James Morris <>
Signed-off-by: Greg Kroah-Hartman <>
Dan Carpenter 2017-02-09 17:17:52 +00:00 committed by Greg Kroah-Hartman
parent f986d63d78
commit 73a0a68779
1 changed files with 1 additions and 1 deletions

View File

@ -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,