diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-06-08 09:47:56 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-06-08 23:29:46 -0400 |
commit | 41f1c53e0d7d6e79087d5f5e18c467747126a3fc (patch) | |
tree | 0a992d5a59483175181e124afce1a2d89de09d84 /security/keys | |
parent | 4e880168e9ffb1cdbdb72b3b48ab0324b30c2d62 (diff) |
KEYS: Delete an error message for a failed memory allocation in get_derived_key()
Omit an extra message for a memory allocation failure in this function.
This issue was detected by using the Coccinelle software.
Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/keys')
-rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 0010955d7876..2ab48eab29a1 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c | |||
@@ -385,10 +385,9 @@ static int get_derived_key(u8 *derived_key, enum derived_key_type key_type, | |||
385 | derived_buf_len = HASH_SIZE; | 385 | derived_buf_len = HASH_SIZE; |
386 | 386 | ||
387 | derived_buf = kzalloc(derived_buf_len, GFP_KERNEL); | 387 | derived_buf = kzalloc(derived_buf_len, GFP_KERNEL); |
388 | if (!derived_buf) { | 388 | if (!derived_buf) |
389 | pr_err("encrypted_key: out of memory\n"); | ||
390 | return -ENOMEM; | 389 | return -ENOMEM; |
391 | } | 390 | |
392 | if (key_type) | 391 | if (key_type) |
393 | strcpy(derived_buf, "AUTH_KEY"); | 392 | strcpy(derived_buf, "AUTH_KEY"); |
394 | else | 393 | else |