KEYS: Fix an error code in request_master_key()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 9 Feb 2017 17:17:52 +0000 (17:17 +0000)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 23 Jul 2017 03:08:45 +0000 (03:08 +0000)
commitf59612b28ae5be3608ddfe0af0dc8b333b5aa8b3
treee47539319304c0f93f239822580da06719575fc5
parent812d5718c489086425f034177d0b10292f68aadd
KEYS: Fix an error code in request_master_key()

commit 57cb17e764ba0aaa169d07796acce54ccfbc6cae 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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
security/keys/encrypted-keys/encrypted.c