Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f1c53e authored by Markus Elfring's avatar Markus Elfring Committed by James Morris
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 4e880168

security/keys/encrypted-keys/encrypted.c

+2 −3
Original line number Diff line number Diff line
@@ -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 = kzalloc(derived_buf_len, GFP_KERNEL);

	if (!derived_buf) {

		pr_err("encrypted_key: out of memory\n");

	if (!derived_buf)

		return -ENOMEM;

	}



	if (key_type)

		strcpy(derived_buf, "AUTH_KEY");

	else