leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keys: fix user_defined key sparse messages

Browse Source 
Replace the rcu_assign_pointer() calls with rcu_assign_keypointer().

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Mimi Zohar 2012-01-18 10:03:14 +00:00 committed by James Morris
parent 3db59dd933
commit f6b24579d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/keys/user_defined.c
View File

@ -59,7 +59,7 @@ int user_instantiate(struct key *key, const void *data, size_t datalen)
/* attach the data */ /* attach the data */
upayload->datalen = datalen; upayload->datalen = datalen;
memcpy(upayload->data, data, datalen); memcpy(upayload->data, data, datalen);
rcu_assign_pointer(key->payload.data, upayload); rcu_assign_keypointer(key, upayload);
ret = 0; ret = 0;
error: error:
@ -98,7 +98,7 @@ int user_update(struct key *key, const void *data, size_t datalen)
if (ret == 0) { if (ret == 0) {
/* attach the new data, displacing the old */ /* attach the new data, displacing the old */
zap = key->payload.data; zap = key->payload.data;
rcu_assign_pointer(key->payload.data, upayload); rcu_assign_keypointer(key, upayload);
key->expiry = 0; key->expiry = 0;
} }
@ -133,7 +133,7 @@ void user_revoke(struct key *key)
key_payload_reserve(key, 0); key_payload_reserve(key, 0);
if (upayload) { if (upayload) {
rcu_assign_pointer(key->payload.data, NULL); rcu_assign_keypointer(key, NULL);
kfree_rcu(upayload, rcu); kfree_rcu(upayload, rcu);
} }
} }