diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2017-01-26 15:14:46 -0700 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:32:09 +0200 |
| commit | 142f7de0a51afc4b3b4d56192ebfce9325598e1f (patch) | |
| tree | e467e79d47b932026febc396a8f8d6165b0edd99 | |
| parent | ff31efd5ae7deca3353989432b040b28517fb657 (diff) | |
security: keys: fix maybe-uninitialized warnings
security/keys/encrypted-keys/encrypted.c: In function 'encrypted_read':
security/keys/encrypted-keys/encrypted.c:922:6: warning: 'master_keylen' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = get_derived_key(derived_key, ENC_KEY, master_key, master_keylen);
~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
security/keys/encrypted-keys/encrypted.c:922:6: warning: 'master_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
security/keys/encrypted-keys/encrypted.c: In function 'encrypted_instantiate':
security/keys/encrypted-keys/encrypted.c:688:6: warning: 'master_keylen' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = datablob_hmac_verify(epayload, format, master_key, master_keylen);
~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
security/keys/encrypted-keys/encrypted.c:660:9: note: 'master_keylen' was declared here
size_t master_keylen;
^~~~~~~~~~~~~
security/keys/encrypted-keys/encrypted.c:688:6: warning: 'master_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = datablob_hmac_verify(epayload, format, master_key, master_keylen);
~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
security/keys/encrypted-keys/encrypted.c:656:6: note: 'master_key' was declared here
u8 *master_key;
^~~~~~~~~~
A null pointer is handled properly by the code in this case. size_t should be initialized to 0.
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 45d5c5926..c752508ab 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -653,11 +653,11 @@ static int encrypted_key_decrypt(struct encrypted_key_payload *epayload, { struct key *mkey; u8 derived_key[HASH_SIZE]; - u8 *master_key; + u8 *master_key = NULL; u8 *hmac; const char *hex_encoded_data; unsigned int encrypted_datalen; - size_t master_keylen; + size_t master_keylen = 0; size_t asciilen; int ret; @@ -898,8 +898,8 @@ static long encrypted_read(const struct key *key, char __user *buffer, { struct encrypted_key_payload *epayload; struct key *mkey; - u8 *master_key; - size_t master_keylen; + u8 *master_key = NULL; + size_t master_keylen = 0; char derived_key[HASH_SIZE]; char *ascii_buf; size_t asciiblob_len; |