diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-10-24 14:17:42 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-11-16 20:23:13 +0100 |
| commit | f4a0d5abef14562c37dee5a1d49180f494106230 (patch) | |
| tree | be3b35ecaf9a2372fae08ac83d006b21e1c43021 /security/keys/encrypted-keys/encrypted.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| download | linux-f4a0d5abef14562c37dee5a1d49180f494106230.tar.xz linux-f4a0d5abef14562c37dee5a1d49180f494106230.zip | |
encrypted-keys: fix error return code
Fix request_master_key() error return code.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.c')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index dcc843cb0f80..41144f71d615 100644 --- 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", |