diff options
| author | James Morris <jmorris@namei.org> | 2011-11-17 19:17:23 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-17 19:17:23 -0500 |
| commit | b85c804d5ad48f239871b95afbddd84422e06f25 (patch) | |
| tree | b78af4d780dc7eec0c7b866194385150e6b29500 /security/keys/encrypted-keys/encrypted.c | |
| parent | fe8a0df46e5076429872887b467c538bc9c0c738 (diff) | |
| parent | 9c69898783a0121399ec078d40d4ccc00e3cb0df (diff) | |
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
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, | |||
| 444 | goto out; | 444 | goto out; |
| 445 | 445 | ||
| 446 | if (IS_ERR(mkey)) { | 446 | if (IS_ERR(mkey)) { |
| 447 | int ret = PTR_ERR(epayload); | 447 | int ret = PTR_ERR(mkey); |
| 448 | 448 | ||
| 449 | if (ret == -ENOTSUPP) | 449 | if (ret == -ENOTSUPP) |
| 450 | pr_info("encrypted_key: key %s not supported", | 450 | pr_info("encrypted_key: key %s not supported", |