projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
KEYS: Delete an error message for a failed memory allocation in get_derived_key()
[linux-2.6-block.git]
/
security
/
keys
/
encrypted-keys
/
encrypted.c
diff --git
a/security/keys/encrypted-keys/encrypted.c
b/security/keys/encrypted-keys/encrypted.c
index 0010955d7876c2302704020af8b2ffb6010f2c0a..2ab48eab29a1bb8137780e31032801851c658a13 100644
(file)
--- 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,
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