Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KEYS: Delete an error message for a failed memory allocation in get_derived_key()

Browse Source 
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>
This commit is contained in:
Markus Elfring 2017-06-08 14:47:56 +01:00 committed by James Morris
parent 4e880168e9
commit 41f1c53e0d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/keys/encrypted-keys/encrypted.c
View File

@ -385,10 +385,9 @@ static int get_derived_key(u8 *derived_key, enum derived_key_type key_type,
derived_buf_len = HASH_SIZE; derived_buf_len = HASH_SIZE;
derived_buf = kzalloc(derived_buf_len, GFP_KERNEL); derived_buf = kzalloc(derived_buf_len, GFP_KERNEL);
if (!derived_buf) { if (!derived_buf)
pr_err("encrypted_key: out of memory\n");
return -ENOMEM; return -ENOMEM;
}
if (key_type) if (key_type)
strcpy(derived_buf, "AUTH_KEY"); strcpy(derived_buf, "AUTH_KEY");
else else