summaryrefslogtreecommitdiffstats
path: root/security/keys/encrypted-keys
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-07-18 19:56:34 +0200
committerDavid Howells <dhowells@redhat.com>2014-07-22 22:46:02 +0200
commitfc7c70e0b6b637bbf6cf8b9cee547d5ae83899c9 (patch)
treed671aaf8c103de0a55cdac7826fe1e18bd569040 /security/keys/encrypted-keys
parentKEYS: Provide a generic instantiation function (diff)
downloadlinux-fc7c70e0b6b637bbf6cf8b9cee547d5ae83899c9.tar.xz
linux-fc7c70e0b6b637bbf6cf8b9cee547d5ae83899c9.zip
KEYS: struct key_preparsed_payload should have two payload pointers
struct key_preparsed_payload should have two payload pointers to correspond with those in struct key. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Steve Dickson <steved@redhat.com> Acked-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'security/keys/encrypted-keys')
-rw-r--r--security/keys/encrypted-keys/encrypted.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 5fe443d120af..d252c5704f8a 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;
}
- rcu_assign_keypointer(key, epayload);
+ prep->payload[0] = epayload;
out:
kfree(datablob);
return ret;