OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff0ff78
)
encrypted-keys: fix error return code
author
Mimi Zohar
<zohar@linux.vnet.ibm.com>
Mon, 24 Oct 2011 12:17:42 +0000
(08:17 -0400)
committer
Mimi Zohar
<zohar@linux.vnet.ibm.com>
Wed, 16 Nov 2011 19:23:13 +0000
(14:23 -0500)
Fix request_master_key() error return code.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
security/keys/encrypted-keys/encrypted.c
patch
|
blob
|
history
diff --git
a/security/keys/encrypted-keys/encrypted.c
b/security/keys/encrypted-keys/encrypted.c
index
dcc843c
..
41144f7
100644
(file)
--- a/
security/keys/encrypted-keys/encrypted.c
+++ b/
security/keys/encrypted-keys/encrypted.c
@@
-444,7
+444,7
@@
static struct key *request_master_key(struct encrypted_key_payload *epayload,
goto out;
if (IS_ERR(mkey)) {
- int ret = PTR_ERR(
epayload
);
+ int ret = PTR_ERR(
mkey
);
if (ret == -ENOTSUPP)
pr_info("encrypted_key: key %s not supported",