projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| c8c7db86 GKH |
1 | From 57cb17e764ba0aaa169d07796acce54ccfbc6cae Mon Sep 17 00:00:00 2001 |
| 2 | From: Dan Carpenter <dan.carpenter@oracle.com> | |
| 3 | Date: Thu, 9 Feb 2017 17:17:52 +0000 | |
| 4 | Subject: KEYS: Fix an error code in request_master_key() | |
| 5 | ||
| 6 | From: Dan Carpenter <dan.carpenter@oracle.com> | |
| 7 | ||
| 8 | commit 57cb17e764ba0aaa169d07796acce54ccfbc6cae upstream. | |
| 9 | ||
| 10 | This function has two callers and neither are able to handle a NULL | |
| 11 | return. Really, -EINVAL is the correct thing return here anyway. This | |
| 12 | fixes some static checker warnings like: | |
| 13 | ||
| 14 | security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt() | |
| 15 | error: uninitialized symbol 'master_key'. | |
| 16 | ||
| 17 | Fixes: 7e70cb497850 ("keys: add new key-type encrypted") | |
| 18 | Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> | |
| 19 | Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> | |
| 20 | Signed-off-by: James Morris <james.l.morris@oracle.com> | |
| 21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 22 | ||
| 23 | --- | |
| 24 | security/keys/encrypted-keys/encrypted.c | 2 +- | |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 26 | ||
| 27 | --- a/security/keys/encrypted-keys/encrypted.c | |
| 28 | +++ b/security/keys/encrypted-keys/encrypted.c | |
| 29 | @@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct bl | |
| 30 | static struct key *request_master_key(struct encrypted_key_payload *epayload, | |
| 31 | u8 **master_key, size_t *master_keylen) | |
| 32 | { | |
| 33 | - struct key *mkey = NULL; | |
| 34 | + struct key *mkey = ERR_PTR(-EINVAL); | |
| 35 | ||
| 36 | if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX, | |
| 37 | KEY_TRUSTED_PREFIX_LEN)) { |