diff options
| author |   Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-07-26 23:21:02 -0400 |
|---|---|---|
| committer |   David Howells <dhowells@redhat.com> | 2014-07-28 12:36:17 +0100 |
| commit | b64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa (patch) | |
| tree | 2c7497d1e2a17af44b59fb82b840f1c3471a5a4f /security/keys | |
| parent | Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next (diff) | |
| download | linux-dev-b64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa.tar.xz linux-dev-b64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa.zip | |
KEYS: revert encrypted key change
Commit fc7c70e "KEYS: struct key_preparsed_payload should have two
payload pointers" erroneously modified encrypted-keys. This patch
reverts the change to that file.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys')
| -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 d252c5704f8a..5fe443d120af 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -811,7 +811,7 @@ static int encrypted_instantiate(struct key *key, goto out; } - prep->payload[0] = epayload; + rcu_assign_keypointer(key, epayload); out: kfree(datablob); return ret; |