KEYS: Fix an error code in request_master_key()

Dan Carpenter · gregkh · commit 92e90c20dc38 · 2017-07-15T11:57:47.000+02:00
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: 7e70cb4 ("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>
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
@@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct blkcipher_desc *desc, 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)) {

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct blkcipher_desc desc, const u8 key,`
`428`	`428`	`static struct key request_master_key(struct encrypted_key_payload epayload,`
`429`	`429`	`const u8 *master_key, size_t master_keylen)`
`430`	`430`	`{`
`431`		`- struct key *mkey = NULL;`
	`431`	`+ struct key *mkey = ERR_PTR(-EINVAL);`
`432`	`432`
`433`	`433`	`if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,`
`434`	`434`	`KEY_TRUSTED_PREFIX_LEN)) {`