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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Jul 2017 08:14:40 +0000 (10:14 +0200)
commit9c2586ce3255d1d2153c0c67687fcfdc223284e0
treec92578a2816def41d37c19fdb7e05dd34484179b
parent02de02fe2b90be589615c8ed5c8ecc07f28b9a9d
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