projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...
[linux-2.6-microblaze.git]
/
security
/
keys
/
encrypted-keys
/
masterkey_trusted.c
diff --git
a/security/keys/encrypted-keys/masterkey_trusted.c
b/security/keys/encrypted-keys/masterkey_trusted.c
index
c68528a
..
d649f2f
100644
(file)
--- a/
security/keys/encrypted-keys/masterkey_trusted.c
+++ b/
security/keys/encrypted-keys/masterkey_trusted.c
@@
-30,7
+30,7
@@
struct key *request_trusted_key(const char *trusted_desc,
struct trusted_key_payload *tpayload;
struct key *tkey;
- tkey = request_key(&key_type_trusted, trusted_desc, NULL);
+ tkey = request_key(&key_type_trusted, trusted_desc, NULL
, NULL
);
if (IS_ERR(tkey))
goto error;