OSDN Git Service

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>
Wed, 12 Jul 2017 13:01:06 +0000 (15:01 +0200)
commit73a0a68779e43e3738175a9880c4d07e1e5d2a63
treea445f294747f638cfce88c14be1740d5afdfdc5c
parentf986d63d788c2c65b734f951be890abaa412a4a1
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